commit 710a090631052993e15d44ec833a604b131f1303 Author: Danny Rawlins <monster.romster@gmail.com> Date: Tue Jun 16 23:23:31 2020 +1000 gst-plugins-base-32: fix for gcc diff --git a/gst-plugins-base-32/.signature b/gst-plugins-base-32/.signature index e701350..15dd005 100644 --- a/gst-plugins-base-32/.signature +++ b/gst-plugins-base-32/.signature @@ -1,5 +1,6 @@ untrusted comment: verify with /etc/ports/compat-32.pub -RWSwxGo/zH7eXcyUxufITxTKaJxXIy2WH4n0fcpOnsMWB8xAOyfoGPHmfYCkUw887byqr8yypvSTnaOc8BoS+rX0DLexug+WbA0= -SHA256 (Pkgfile) = 62846bcb63d75e3bdba2ba2fd7cb466a4d5166a083d7d52222263eb61cb044b0 +RWSwxGo/zH7eXUbuB5ZgNTHkME9ybzTVyqEwgw0Uc1it+kSObhL3sW/3drQu76YxFITCB6pyLiWVaS4eKXnXxvTNSjYxrWKlmAk= +SHA256 (Pkgfile) = 5bc677c3f51ee6de69342b02f9bf3ea0892ea05bd60e0245d1f85207d544915d SHA256 (.footprint) = ac3e4cf5e4af6f94b2ae3469647779bf87486483f7b5c84233fb78464971d3d4 SHA256 (gst-plugins-base-1.16.2.tar.xz) = b13e73e2fe74a4166552f9577c3dcb24bed077021b9c7fa600d910ec6987816a +SHA256 (gst-plugins-base-1.16.2-make43.patch) = c76b90bd5331926fc5ba1e52b18e6762e18fd037cdd402edd7c0c4d04cea5a1a diff --git a/gst-plugins-base-32/Pkgfile b/gst-plugins-base-32/Pkgfile index d9015cf..e252851 100644 --- a/gst-plugins-base-32/Pkgfile +++ b/gst-plugins-base-32/Pkgfile @@ -7,11 +7,14 @@ name=gst-plugins-base-32 version=1.16.2 release=1 -source=(https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-$ver...) +source=(https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-$ver... + gst-plugins-base-1.16.2-make43.patch) build() { cd gst-plugins-base-$version + patch -p1 -i $SRC/gst-plugins-base-1.16.2-make43.patch + ./configure \ --prefix=/usr \ --libdir=/usr/lib32 \ diff --git a/gst-plugins-base-32/gst-plugins-base-1.16.2-make43.patch b/gst-plugins-base-32/gst-plugins-base-1.16.2-make43.patch new file mode 100644 index 0000000..f812196 --- /dev/null +++ b/gst-plugins-base-32/gst-plugins-base-1.16.2-make43.patch @@ -0,0 +1,347 @@ +--- 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/gst/encoding/Makefile.in ++++ b/gst/encoding/Makefile.in +@@ -17,12 +17,14 @@ + # 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> + + + VPATH = @srcdir@ +@@ -638,7 +640,7 @@ + gstsmartencoder.h \ + gststreamcombinerpad.h + +-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") ++enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\") + all: all-am + + .SUFFIXES: +--- a/gst-libs/gst/app/Makefile.in ++++ b/gst-libs/gst/app/Makefile.in +@@ -17,13 +17,15 @@ + # 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> + + + VPATH = @srcdir@ +@@ -618,12 +620,12 @@ + glib_gen_prefix = __gst_app + glib_gen_basename = app + glib_gen_decl_banner = GST_APP_API +-glib_gen_decl_include = \#include <gst/app/app-prelude.h> ++glib_gen_decl_include = $(H)include <gst/app/app-prelude.h> + glib_enum_headers = gstappsrc.h + built_sources = app-enumtypes.c + built_headers = app-enumtypes.h + BUILT_SOURCES = $(built_sources) $(built_headers) +-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") ++enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\") + libgstapp_@GST_API_VERSION@_la_SOURCES = gstappsrc.c gstappsink.c + nodist_libgstapp_@GST_API_VERSION@_la_SOURCES = $(BUILT_SOURCES) + libgstapp_@GST_API_VERSION@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \ +--- a/gst-libs/gst/audio/Makefile.in ++++ b/gst-libs/gst/audio/Makefile.in +@@ -39,13 +39,15 @@ + # 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> + + + VPATH = @srcdir@ +@@ -784,7 +786,7 @@ + glib_gen_prefix = gst_audio + glib_gen_basename = audio + glib_gen_decl_banner = GST_AUDIO_API +-glib_gen_decl_include = \#include <gst/audio/audio-prelude.h> ++glib_gen_decl_include = $(H)include <gst/audio/audio-prelude.h> + built_sources = audio-enumtypes.c + built_headers = audio-enumtypes.h + lib_LTLIBRARIES = \ +@@ -895,7 +897,7 @@ + @HAVE_X86_TRUE@ $(GST_LIB_LDFLAGS) \ + @HAVE_X86_TRUE@ $(GST_ALL_LDFLAGS) + +-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") ++enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\") + + # Introspection + @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstAudio-@GST_API_VERSION@.gir +--- a/gst-libs/gst/pbutils/Makefile.in ++++ b/gst-libs/gst/pbutils/Makefile.in +@@ -17,13 +17,15 @@ + # 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> + + + VPATH = @srcdir@ +@@ -664,6 +666,7 @@ + gstdiscoverer.h \ + gstaudiovisualizer.h + ++H := \# + + # variables used for enum/marshal generation + glib_enum_headers = $(headers_pbutils) +@@ -671,7 +674,7 @@ + glib_gen_prefix = pbutils + glib_gen_basename = pbutils + glib_gen_decl_banner = GST_PBUTILS_API +-glib_gen_decl_include = \#include <gst/pbutils/pbutils-prelude.h> ++glib_gen_decl_include = $(H)include <gst/pbutils/pbutils-prelude.h> + built_headers_configure = \ + gstpluginsbaseversion.h + +@@ -719,7 +722,7 @@ + + # DISTCLEANFILES is for files generated by configure + DISTCLEANFILES = $(built_headers_configure) +-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") ++enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\") + @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstPbutils-@GST_API_VERSION@.gir + @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \ + @HAVE_INTROSPECTION_TRUE@ $(libgstpbutils_@GST_API_VERSION@include_HEADERS)) \ +--- a/gst-libs/gst/rtp/Makefile.in ++++ b/gst-libs/gst/rtp/Makefile.in +@@ -17,13 +17,15 @@ + # 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> + + + VPATH = @srcdir@ +@@ -675,8 +677,8 @@ + glib_enum_headers = $(libgstrtpinclude_HEADERS) + glib_gen_basename = gstrtp + glib_gen_decl_banner = GST_RTP_API +-glib_gen_decl_include = \#include <gst/rtp/rtp-prelude.h> +-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") ++glib_gen_decl_include = $(H)include <gst/rtp/rtp-prelude.h> ++enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\") + @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstRtp-@GST_API_VERSION@.gir + @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \ + @HAVE_INTROSPECTION_TRUE@ $(libgstrtpinclude_HEADERS)) \ +--- a/gst-libs/gst/rtsp/Makefile.in ++++ b/gst-libs/gst/rtsp/Makefile.in +@@ -17,13 +17,15 @@ + # 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> + + + VPATH = @srcdir@ +@@ -679,8 +681,8 @@ + glib_enum_headers = $(libgstrtspinclude_HEADERS) + glib_gen_basename = gstrtsp + glib_gen_decl_banner = GST_RTSP_API +-glib_gen_decl_include = \#include <gst/rtsp/rtsp-prelude.h> +-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") ++glib_gen_decl_include = $(H)include <gst/rtsp/rtsp-prelude.h> ++enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\") + @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstRtsp-@GST_API_VERSION@.gir + @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \ + @HAVE_INTROSPECTION_TRUE@ $(libgstrtspinclude_HEADERS)) \ +--- a/gst-libs/gst/tag/Makefile.in ++++ b/gst-libs/gst/tag/Makefile.in +@@ -17,13 +17,15 @@ + # 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> + + + VPATH = @srcdir@ +@@ -680,12 +682,12 @@ + glib_gen_prefix = gst_tag + glib_gen_basename = tag + glib_gen_decl_banner = GST_TAG_API +-glib_gen_decl_include = \#include <gst/tag/tag-prelude.h> ++glib_gen_decl_include = $(H)include <gst/tag/tag-prelude.h> + glib_enum_headers = tag.h gsttagdemux.h + built_sources = tag-enumtypes.c + built_headers = tag-enumtypes.h + BUILT_SOURCES = $(built_sources) $(built_headers) +-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") ++enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\") + libgsttaginclude_HEADERS = \ + tag.h tag-prelude.h gsttagdemux.h gsttagmux.h xmpwriter.h + +--- a/gst-libs/gst/video/Makefile.in ++++ b/gst-libs/gst/video/Makefile.in +@@ -39,13 +39,15 @@ + # 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> + + + VPATH = @srcdir@ +@@ -740,7 +742,7 @@ + glib_gen_prefix = gst_video + glib_gen_basename = video + glib_gen_decl_banner = GST_VIDEO_API +-glib_gen_decl_include = \#include <gst/video/video-prelude.h> ++glib_gen_decl_include = $(H)include <gst/video/video-prelude.h> + built_sources = video-enumtypes.c + built_headers = video-enumtypes.h + lib_LTLIBRARIES = libgstvideo-@GST_API_VERSION@.la +@@ -821,7 +823,7 @@ + + libgstvideo_@GST_API_VERSION@_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(ORC_LIBS) $(LIBM) + libgstvideo_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) +-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") ++enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\") + @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstVideo-@GST_API_VERSION@.gir + @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \ + @HAVE_INTROSPECTION_TRUE@ $(libgstvideo_@GST_API_VERSION@include_HEADERS)) \ +--- a/gst-libs/gst/gl/Makefile.in ++++ b/gst-libs/gst/gl/Makefile.in +@@ -17,12 +17,14 @@ + # 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> + + + +@@ -863,14 +865,14 @@ glib_enum_define = GST_GL + glib_gen_prefix = gst_gl + glib_gen_basename = gl + glib_gen_decl_banner = GST_GL_API +-glib_gen_decl_include = \#include <gst/gl/gl-prelude.h> ++glib_gen_decl_include = ${H}include <gst/gl/gl-prelude.h> + built_sources = gl-enumtypes.c + built_headers = gl-enumtypes.h + BUILT_SOURCES = $(built_sources) $(built_headers) + CLEANFILES = $(BUILT_SOURCES) $(am__append_27) + nodist_libgstgl_@GST_API_VERSION@include_HEADERS = $(built_headers) + nodist_libgstgl_@GST_API_VERSION@_la_SOURCES = $(BUILT_SOURCES) +-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") ++enum_headers = $(foreach h,$(glib_enum_headers),\n${H}include \"$(h)\") + @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstGL-@GST_API_VERSION@.gir + @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \ + @HAVE_INTROSPECTION_TRUE@ $(gstgl_gir_headers)) $(patsubst \