CVS commit: pkgsrc/multimedia/gst-plugins1-base

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Tue Apr 19 13:00:27 UTC 2022

Modified Files:
        pkgsrc/multimedia/gst-plugins1-base: distinfo
        pkgsrc/multimedia/gst-plugins1-base/patches:
            patch-gst-libs_gst_gl_meson.build

Log Message:
gst-plugins1-base: mend broken meson pkgsrc patch for gst-gl

The patch has syntax errors and I think it is only needed for
wip/gst-plugins1-gl?
This might need to be done differently but should hopefully unbreak the
base package which is more urgent until a proper fix can be made.


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 pkgsrc/multimedia/gst-plugins1-base/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/multimedia/gst-plugins1-base/patches/patch-gst-libs_gst_gl_meson.build

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/gst-plugins1-base/distinfo
diff -u pkgsrc/multimedia/gst-plugins1-base/distinfo:1.44 pkgsrc/multimedia/gst-plugins1-base/distinfo:1.45
--- pkgsrc/multimedia/gst-plugins1-base/distinfo:1.44   Mon Apr 18 12:36:08 2022
+++ pkgsrc/multimedia/gst-plugins1-base/distinfo        Tue Apr 19 13:00:27 2022
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.44 2022/04/18 12:36:08 nia Exp $
+$NetBSD: distinfo,v 1.45 2022/04/19 13:00:27 tnn Exp $
 
 BLAKE2s (gst-plugins-base-1.20.1.tar.xz) = 5119ee161501df82815eb52559ee73c3edbaeb6df436c27a0e29203c3d2daf5e
 SHA512 (gst-plugins-base-1.20.1.tar.xz) = 679a0eee1973fa9612e2e24978e2c2d9d8fdc5732e1699b4a87712881f1549d0811719a13ff4fe77b91322ca4425c39623b371703f6b3a36fb7238b977d3e541
 Size (gst-plugins-base-1.20.1.tar.xz) = 3290068 bytes
 SHA1 (patch-ext_cdparanoia_gstcdparanoiasrc.h) = 5325f27c81cd9dc2f998bcb7733ef6b0c9a902e8
-SHA1 (patch-gst-libs_gst_gl_meson.build) = 642a96d5c659f9ac0ece878c8fa4d66ee4639a74
+SHA1 (patch-gst-libs_gst_gl_meson.build) = 548dfacb2103ff57bb8dfd764a1655e3e9079b7a
 SHA1 (patch-meson.build) = 0fae465ac873b12103f693e3812b3bfc6b1f6971

Index: pkgsrc/multimedia/gst-plugins1-base/patches/patch-gst-libs_gst_gl_meson.build
diff -u pkgsrc/multimedia/gst-plugins1-base/patches/patch-gst-libs_gst_gl_meson.build:1.1 pkgsrc/multimedia/gst-plugins1-base/patches/patch-gst-libs_gst_gl_meson.build:1.2
--- pkgsrc/multimedia/gst-plugins1-base/patches/patch-gst-libs_gst_gl_meson.build:1.1   Mon Apr 18 12:36:08 2022
+++ pkgsrc/multimedia/gst-plugins1-base/patches/patch-gst-libs_gst_gl_meson.build       Tue Apr 19 13:00:27 2022
@@ -1,22 +1,19 @@
-$NetBSD: patch-gst-libs_gst_gl_meson.build,v 1.1 2022/04/18 12:36:08 nia Exp $
+$NetBSD: patch-gst-libs_gst_gl_meson.build,v 1.2 2022/04/19 13:00:27 tnn Exp $
 
 build_gstgl must be defined in the root meson.build so it's available
 when we are building plugins independently.
 
 --- gst-libs/gst/gl/meson.build.orig   2022-03-14 11:33:40.000000000 +0000
 +++ gst-libs/gst/gl/meson.build
-@@ -1,10 +1,3 @@
+@@ -1,5 +1,5 @@
 -if get_option('gl').disabled()
 -  message('GStreamer OpenGL integration disabled via options.')
--  gstgl_dep = dependency('', required: false)
--  build_gstgl = false
--  subdir_done()
--endif
--
- gl_sources = files([
-   'gstglapi.c',
-   'gstglbasefilter.c',
-@@ -952,18 +945,24 @@ if egl_dep.found()
++if 1 == 1
++  message('GStreamer OpenGL integration disabled via pkgsrc kludge')
+   gstgl_dep = dependency('', required: false)
+   build_gstgl = false
+   subdir_done()
+@@ -952,18 +952,22 @@ if egl_dep.found()
    endif
  endif
  
@@ -24,12 +21,12 @@ when we are building plugins independent
  if enabled_gl_apis.length() == 0
    message('No OpenGL API libraries found or requested')
    build_gstgl = false
- endif
+-endif
 -if enabled_gl_platforms.length() == 0
 +elif enabled_gl_platforms.length() == 0
    message('No OpenGL Platforms found or requested')
    build_gstgl = false
- endif
+-endif
 -if enabled_gl_winsys.length() == 0
 +elif enabled_gl_winsys.length() == 0
    message('No OpenGL Window systems found or requested')