commit 9827ff38e9250b2f48f4e131a05687bf63b34b16 Author: Danny Rawlins <monster.romster@gmail.com> Date: Tue Jun 16 20:54:26 2020 +1000 gstreamer-32: fix for gcc diff --git a/gstreamer-32/.signature b/gstreamer-32/.signature index ff54cc4..1097a08 100644 --- a/gstreamer-32/.signature +++ b/gstreamer-32/.signature @@ -1,5 +1,6 @@ untrusted comment: verify with /etc/ports/compat-32.pub -RWSwxGo/zH7eXXOCx9Dl6yLt1EK/spm7nArWBtohptC/z7TleZXopbWMmnt/tMa1lyT98e95oJD4Z288Xw3/KNPzJ024c1oELAk= -SHA256 (Pkgfile) = f7aa5a7a42489b0ad8fa92def30346b5b2d63db69b8cb08ad8c73a069f52bf94 +RWSwxGo/zH7eXUz0DCl9EbbPLjMckN8d5mQi0l0JFiMWZ6F0MPFLAa/fDSPPF9aDisxo7tK47a2sAgzlVP6AIueXqvcb3NCnfwQ= +SHA256 (Pkgfile) = 338bd0758dd91236bb09da2bffe4abc96d3ad97dfcf632ac40ea0cd399eab814 SHA256 (.footprint) = e3b7a334b31b1479504f033a4d37d50c5fd781a6222d938fa5485d22736b6e77 SHA256 (gstreamer-1.16.2.tar.xz) = e3f044246783fd685439647373fa13ba14f7ab0b346eadd06437092f8419e94e +SHA256 (gstreamer-1.14.5-make43.patch) = dc0fe4e1335f5ff4d3aa007301a6419ddbb92b15cb5e130ce48cdb83ab03d12b diff --git a/gstreamer-32/Pkgfile b/gstreamer-32/Pkgfile index 53c9b66..cc37efc 100644 --- a/gstreamer-32/Pkgfile +++ b/gstreamer-32/Pkgfile @@ -6,20 +6,27 @@ name=gstreamer-32 version=1.16.2 release=1 -source=(https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-$version.tar.xz) +source=(https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-$version.tar.xz + gstreamer-1.14.5-make43.patch) build() { cd gstreamer-$version + patch -p1 -i $SRC/gstreamer-1.14.5-make43.patch + ./configure \ --prefix=/usr \ --libdir=/usr/lib32 \ --libexecdir=/usr/lib32 \ + --build=i686-pc-linux-gnu \ --disable-debug \ --disable-nls \ --disable-dependency-tracking \ --disable-valgrind \ - --disable-examples + --disable-examples \ + --disable-gtk-doc-html \ + --disable-gtk-doc-pdf \ + --disable-gtk-doc # fight unused direct deps sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool diff --git a/gstreamer-32/gstreamer-1.14.5-make43.patch b/gstreamer-32/gstreamer-1.14.5-make43.patch new file mode 100644 index 0000000..e22cc9f --- /dev/null +++ b/gstreamer-32/gstreamer-1.14.5-make43.patch @@ -0,0 +1,84 @@ +--- a/common/glib-gen.mak ++++ b/common/glib-gen.mak +@@ -1,11 +1,13 @@ + # these are the variables your Makefile.am should set + # the example is based on the colorbalance interface + ++H := \# ++ + #glib_enum_headers=$(colorbalance_headers) + #glib_enum_define=GST_COLOR_BALANCE + #glib_enum_prefix=gst_color_balance + +-enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") ++enum_headers=$(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\") + + # these are all the rules generating the relevant files + %-marshal.h: %-marshal.list +--- a/common/gst-glib-gen.mak ++++ b/common/gst-glib-gen.mak +@@ -1,14 +1,16 @@ + # these are the variables your Makefile.am should set + # the example is based on the colorbalance interface + ++H := \# ++ + #glib_enum_headers=$(colorbalance_headers) + #glib_enum_define=GST_COLOR_BALANCE + #glib_gen_prefix=gst_color_balance + #glib_gen_basename=colorbalance + #glib_gen_decl_banner=GST_EXPORT +-#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h> ++#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h> + +-enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") ++enum_headers=$(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\") + + # these are all the rules generating the relevant files + $(glib_gen_basename)-marshal.h: $(glib_gen_basename)-marshal.list +--- a/libs/gst/controller/Makefile.in ++++ b/libs/gst/controller/Makefile.in +@@ -17,13 +17,6 @@ + # these are the variables your Makefile.am should set + # the example is based on the colorbalance interface + +-#glib_enum_headers=$(colorbalance_headers) +-#glib_enum_define=GST_COLOR_BALANCE +-#glib_gen_prefix=gst_color_balance +-#glib_gen_basename=colorbalance +-#glib_gen_decl_banner=GST_EXPORT +-#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h> +- + + + VPATH = @srcdir@ +@@ -550,11 +543,12 @@ + gstinterpolationcontrolsource.h \ + gstlfocontrolsource.h + ++H := \# + glib_enum_define = GST_CONTROLLER + glib_gen_prefix = gst + glib_gen_basename = controller + glib_gen_decl_banner = GST_CONTROLLER_API +-glib_gen_decl_include = \#include <gst/controller/controller-prelude.h> ++glib_gen_decl_include = $(H)include <gst/controller/controller-prelude.h> + built_sources = controller-enumtypes.c + built_headers = controller-enumtypes.h + BUILT_SOURCES = $(built_sources) $(built_headers) +@@ -587,7 +581,14 @@ + libgstcontroller_@GST_API_VERSION@_la_LIBADD = $(GST_OBJ_LIBS) $(LIBM) + libgstcontroller_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) + CLEANFILES = *.gcno *.gcda *.gcov $(BUILT_SOURCES) $(am__append_1) +-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") ++ ++#glib_enum_headers=$(colorbalance_headers) ++#glib_enum_define=GST_COLOR_BALANCE ++#glib_gen_prefix=gst_color_balance ++#glib_gen_basename=colorbalance ++#glib_gen_decl_banner=GST_EXPORT ++#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h> ++enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\") + @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstController-@GST_API_VERSION@.gir + @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \ + @HAVE_INTROSPECTION_TRUE@ $(libgstcontroller_@GST_API_VERSION@_include_HEADERS)) \