From 2a3f8d01210715047c3005981c49fd42014bf2f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Mon, 26 Apr 2021 23:43:24 +0200 Subject: [PATCH 1/6] gst-plugins-base: Fix build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We should get gid of this... Signed-off-by: Andreas Müller --- .../0002-Fix-stray.patch | 169 ++++++++++++++++++ .../gst-plugins-base_0.10.36.bb | 1 + 2 files changed, 170 insertions(+) create mode 100644 recipes-gstreamer/gstreamer-0.10/gst-plugins-base-0.10.36/0002-Fix-stray.patch diff --git a/recipes-gstreamer/gstreamer-0.10/gst-plugins-base-0.10.36/0002-Fix-stray.patch b/recipes-gstreamer/gstreamer-0.10/gst-plugins-base-0.10.36/0002-Fix-stray.patch new file mode 100644 index 0000000..076cc07 --- /dev/null +++ b/recipes-gstreamer/gstreamer-0.10/gst-plugins-base-0.10.36/0002-Fix-stray.patch @@ -0,0 +1,169 @@ +From eaabea6bb8242adb7bdf994b03283e6b627b7e4d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Mon, 26 Apr 2021 23:34:33 +0200 +Subject: [PATCH] Fix stray '\' +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Andreas Müller +--- + common/glib-gen.mak | 2 +- + common/gst-glib-gen.mak | 2 +- + gst-libs/gst/app/Makefile.in | 2 +- + gst-libs/gst/audio/Makefile.in | 2 +- + gst-libs/gst/interfaces/Makefile.in | 2 +- + gst-libs/gst/pbutils/Makefile.in | 2 +- + gst-libs/gst/rtsp/Makefile.in | 2 +- + gst-libs/gst/video/Makefile.in | 2 +- + gst/encoding/Makefile.in | 2 +- + gst/playback/Makefile.in | 2 +- + gst/tcp/Makefile.in | 2 +- + 11 files changed, 11 insertions(+), 11 deletions(-) + +diff --git a/common/glib-gen.mak b/common/glib-gen.mak +index ef93a5f..e43e126 100644 +--- a/common/glib-gen.mak ++++ b/common/glib-gen.mak +@@ -5,7 +5,7 @@ + #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#include \"$(h)\") + + # these are all the rules generating the relevant files + %-marshal.h: %-marshal.list +diff --git a/common/gst-glib-gen.mak b/common/gst-glib-gen.mak +index cc82bbd..a18d284 100644 +--- a/common/gst-glib-gen.mak ++++ b/common/gst-glib-gen.mak +@@ -6,7 +6,7 @@ + #glib_gen_prefix=gst_color_balance + #glib_gen_basename=colorbalance + +-enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") ++enum_headers=$(foreach h,$(glib_enum_headers),\n#include \"$(h)\") + + # these are all the rules generating the relevant files + $(glib_gen_basename)-marshal.h: $(glib_gen_basename)-marshal.list +diff --git a/gst-libs/gst/app/Makefile.in b/gst-libs/gst/app/Makefile.in +index 8256253..89bbd45 100644 +--- a/gst-libs/gst/app/Makefile.in ++++ b/gst-libs/gst/app/Makefile.in +@@ -513,7 +513,7 @@ lib_LTLIBRARIES = libgstapp-@GST_MAJORMINOR@.la + glib_enum_define = GST_APP + glib_gen_prefix = __gst_app + glib_gen_basename = gstapp +-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") ++enum_headers = $(foreach h,$(glib_enum_headers),\n#include \"$(h)\") + built_sources = gstapp-marshal.c + built_headers = gstapp-marshal.h + BUILT_SOURCES = $(built_sources) $(built_headers) +diff --git a/gst-libs/gst/audio/Makefile.in b/gst-libs/gst/audio/Makefile.in +index 95c6585..c76a672 100644 +--- a/gst-libs/gst/audio/Makefile.in ++++ b/gst-libs/gst/audio/Makefile.in +@@ -594,7 +594,7 @@ libgstaudio_@GST_MAJORMINOR@_la_LIBADD = \ + $(GST_BASE_LIBS) $(GST_LIBS) + + libgstaudio_@GST_MAJORMINOR@_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#include \"$(h)\") + @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstAudio-@GST_MAJORMINOR@.gir + @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \ + @HAVE_INTROSPECTION_TRUE@ $(libgstaudio_@GST_MAJORMINOR@include_HEADERS)) \ +diff --git a/gst-libs/gst/interfaces/Makefile.in b/gst-libs/gst/interfaces/Makefile.in +index 5a0daff..283322e 100644 +--- a/gst-libs/gst/interfaces/Makefile.in ++++ b/gst-libs/gst/interfaces/Makefile.in +@@ -619,7 +619,7 @@ BUILT_SOURCES = \ + + EXTRA_DIST = interfaces-marshal.list + CLEANFILES = $(BUILT_SOURCES) $(am__append_1) +-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") ++enum_headers = $(foreach h,$(glib_enum_headers),\n#include \"$(h)\") + @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstInterfaces-@GST_MAJORMINOR@.gir + @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \ + @HAVE_INTROSPECTION_TRUE@ $(libgstinterfacesinclude_HEADERS)) \ +diff --git a/gst-libs/gst/pbutils/Makefile.in b/gst-libs/gst/pbutils/Makefile.in +index 49fae33..103df79 100644 +--- a/gst-libs/gst/pbutils/Makefile.in ++++ b/gst-libs/gst/pbutils/Makefile.in +@@ -608,7 +608,7 @@ CLEANFILES = $(BUILT_SOURCES) $(am__append_1) + + # 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#include \"$(h)\") + @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstPbutils-@GST_MAJORMINOR@.gir + @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \ + @HAVE_INTROSPECTION_TRUE@ $(libgstpbutils_@GST_MAJORMINOR@include_HEADERS)) \ +diff --git a/gst-libs/gst/rtsp/Makefile.in b/gst-libs/gst/rtsp/Makefile.in +index 089b245..edf0328 100644 +--- a/gst-libs/gst/rtsp/Makefile.in ++++ b/gst-libs/gst/rtsp/Makefile.in +@@ -579,7 +579,7 @@ glib_gen_prefix = __gst_rtsp + glib_enum_define = gst_rtsp + glib_enum_headers = gstrtspdefs.h + glib_gen_basename = gstrtsp +-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") ++enum_headers = $(foreach h,$(glib_enum_headers),\n#include \"$(h)\") + @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstRtsp-@GST_MAJORMINOR@.gir + @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \ + @HAVE_INTROSPECTION_TRUE@ $(libgstrtspinclude_HEADERS)) \ +diff --git a/gst-libs/gst/video/Makefile.in b/gst-libs/gst/video/Makefile.in +index ece09b8..f1249d5 100644 +--- a/gst-libs/gst/video/Makefile.in ++++ b/gst-libs/gst/video/Makefile.in +@@ -597,7 +597,7 @@ libgstvideo_@GST_MAJORMINOR@_la_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#include \"$(h)\") + @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstVideo-@GST_MAJORMINOR@.gir + @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \ + @HAVE_INTROSPECTION_TRUE@ $(libgstvideo_@GST_MAJORMINOR@include_HEADERS)) \ +diff --git a/gst/encoding/Makefile.in b/gst/encoding/Makefile.in +index ef779d3..2957fc9 100644 +--- a/gst/encoding/Makefile.in ++++ b/gst/encoding/Makefile.in +@@ -552,7 +552,7 @@ noinst_HEADERS = \ + BUILT_SOURCES = $(built_headers) $(built_sources) + EXTRA_DIST = gstencode-marshal.list + CLEANFILES = $(BUILT_SOURCES) +-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") ++enum_headers = $(foreach h,$(glib_enum_headers),\n#include \"$(h)\") + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + +diff --git a/gst/playback/Makefile.in b/gst/playback/Makefile.in +index f56b49d..cd9bd4a 100644 +--- a/gst/playback/Makefile.in ++++ b/gst/playback/Makefile.in +@@ -644,7 +644,7 @@ noinst_HEADERS = \ + BUILT_SOURCES = $(built_headers) $(built_sources) + EXTRA_DIST = gstplay-marshal.list + CLEANFILES = $(BUILT_SOURCES) +-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") ++enum_headers = $(foreach h,$(glib_enum_headers),\n#include \"$(h)\") + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + +diff --git a/gst/tcp/Makefile.in b/gst/tcp/Makefile.in +index 65e6408..1f4a879 100644 +--- a/gst/tcp/Makefile.in ++++ b/gst/tcp/Makefile.in +@@ -534,7 +534,7 @@ glib_enum_headers = gsttcp.h + glib_enum_define = GST_TCP + glib_gen_prefix = gst_tcp + glib_gen_basename = gsttcp +-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") ++enum_headers = $(foreach h,$(glib_enum_headers),\n#include \"$(h)\") + built_sources = gsttcp-enumtypes.c gsttcp-marshal.c + built_headers = gsttcp-enumtypes.h gsttcp-marshal.h + BUILT_SOURCES = $(built_sources) $(built_headers) +-- +2.30.2 + diff --git a/recipes-gstreamer/gstreamer-0.10/gst-plugins-base_0.10.36.bb b/recipes-gstreamer/gstreamer-0.10/gst-plugins-base_0.10.36.bb index 8ec304e..26fc525 100644 --- a/recipes-gstreamer/gstreamer-0.10/gst-plugins-base_0.10.36.bb +++ b/recipes-gstreamer/gstreamer-0.10/gst-plugins-base_0.10.36.bb @@ -12,6 +12,7 @@ SRC_URI += "file://gst-plugins-base-tremor.patch \ file://configure.ac-fix-subparse-plugin.patch \ file://audioresample-Fix-build-on-x86-if-emmintrin.h-is-ava.patch \ file://0001-aclocal.m4-don-t-do-crazy-things-to-GLIB_CFLAGS.patch \ + file://0002-Fix-stray.patch \ " SRC_URI[md5sum] = "776c73883e567f67b9c4a2847d8d041a" From c3ff6aa3e1574f6ffd51fb7447b556bd30b09239 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Mon, 26 Apr 2021 23:57:10 +0200 Subject: [PATCH 2/6] soundfont-collection: fix fetch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- .../soundfont-collection/soundfont-collection_0.0.3.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-musicians/soundfont-collection/soundfont-collection_0.0.3.bb b/recipes-musicians/soundfont-collection/soundfont-collection_0.0.3.bb index 3efeffb..2131578 100644 --- a/recipes-musicians/soundfont-collection/soundfont-collection_0.0.3.bb +++ b/recipes-musicians/soundfont-collection/soundfont-collection_0.0.3.bb @@ -83,7 +83,7 @@ SRC_URI[rabs-new-construction-kit.sha256sum] = "b3fce24ba733c78afb9bbf12e973d2d8 SRC_URI[rabs-organs.sha256sum] = "14765b576626e440caf054c7b3a502b03cd95b451d4e8bf53f623705de8a5174" SRC_URI[rabs-stratocaster.sha256sum] = "1966c40643b0de18f825fb26f10fdf5aabb298b69268be43d0e5b5c434fd6621" SRC_URI[rabs-wwgtr.sha256sum] = "a17be1dff75bf76af0ac78e9fec75313a7375ac1e388709546c4e732c1ca1652" -SRC_URI[rabs-meta.sha256sum] = "74ff57376b6ce383e0fe3a0b6c391774a7d926585112f7a8650b5bef55bf169a" +SRC_URI[rabs-meta.sha256sum] = "d3b10719b9bf41f598f7cd9d555c6d4852e0eb3c734ef9694fba0451d091e778" do_unpack[depends] += "p7zip-native:do_populate_sysroot" From d3ad7e6629d192c6adeb7c92b267b552fdcaf6f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Wed, 28 Apr 2021 21:53:56 +0200 Subject: [PATCH 3/6] muse: upgrade 3.1.1 -> 4.0.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- recipes-musicians/muse/{muse_git.bb => muse.bb} | 16 ++++++++-------- ...-find-aeffectx.h-it-is-not-found-for-un.patch | 8 ++++---- ...se-find-unused-wavs-convert-to-pythomn3.patch | 8 ++++---- 3 files changed, 16 insertions(+), 16 deletions(-) rename recipes-musicians/muse/{muse_git.bb => muse.bb} (79%) diff --git a/recipes-musicians/muse/muse_git.bb b/recipes-musicians/muse/muse.bb similarity index 79% rename from recipes-musicians/muse/muse_git.bb rename to recipes-musicians/muse/muse.bb index b9bcd57..7fbf7ba 100644 --- a/recipes-musicians/muse/muse_git.bb +++ b/recipes-musicians/muse/muse.bb @@ -1,7 +1,7 @@ SUMMARY = "MusE is a digital audio workstation" HOMEPAGE = "http://muse-sequencer.org/" LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://muse3/COPYING;md5=328283dc167a7b37ffdc59f524a7fc4d" +LIC_FILES_CHKSUM = "file://src/COPYING;md5=328283dc167a7b37ffdc59f524a7fc4d" DEPENDS += " \ qtbase \ @@ -28,17 +28,17 @@ SRC_URI = " \ file://0001-Do-not-try-to-find-aeffectx.h-it-is-not-found-for-un.patch \ file://0002-muse-find-unused-wavs-convert-to-pythomn3.patch \ " -SRCREV = "2b479fecc447871c10b08dcd8aabb1ac9b0bdfc7" -PV = "3.1.1" +SRCREV = "3e79cbcbea4480a43dc6052fb0fc118c356fb404" +PV = "4.0.0" S = "${WORKDIR}/git" -OECMAKE_SOURCEPATH = "${S}/muse3" +OECMAKE_SOURCEPATH = "${S}/src" EXTRA_OECMAKE += " \ -DLIB_INSTALL_DIR=${libdir} \ -DMODULES_BUILD_STATIC=1 \ -DCMAKE_SHARED_LINKER_FLAGS='${LDFLAGS} -Wl,--no-undefined' \ - -DVST_HEADER_PATH=${S}/muse3/vestige \ + -DVST_HEADER_PATH=${S}/src/vestige \ -DENABLE_VST_VESTIGE=1 \ \ -DENABLE_LV2=1 \ @@ -52,7 +52,7 @@ EXTRA_OECMAKE += " \ do_install_append() { # remove python script to convert songs from very old muse to avoid # python rdeps - rm -f ${D}${datadir}/muse-3.1/utils/muse-song-convert.py + rm -f ${D}${datadir}/muse-4.0/utils/muse-song-convert.py } QT_TRANSLATION_FILES = "${datadir}/*/locale/*.qm" @@ -61,8 +61,8 @@ FILES_${PN}-locale = "${datadir}/muse-3.0/locale" FILES_${PN} += " \ ${datadir}/mime \ ${datadir}/metainfo \ - ${datadir}/muse-3.1 \ - ${libdir}/muse-3.1 \ + ${datadir}/muse-4.0 \ + ${libdir}/muse-4.0 \ " RDEPENDS_${PN} += "python3-core" diff --git a/recipes-musicians/muse/muse/0001-Do-not-try-to-find-aeffectx.h-it-is-not-found-for-un.patch b/recipes-musicians/muse/muse/0001-Do-not-try-to-find-aeffectx.h-it-is-not-found-for-un.patch index 0157ae7..ff35e38 100644 --- a/recipes-musicians/muse/muse/0001-Do-not-try-to-find-aeffectx.h-it-is-not-found-for-un.patch +++ b/recipes-musicians/muse/muse/0001-Do-not-try-to-find-aeffectx.h-it-is-not-found-for-un.patch @@ -11,13 +11,13 @@ Upstream-Status: Inappropriate [OE-specific] Signed-off-by: Andreas Müller --- - muse3/CMakeLists.txt | 1 - + src/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) -diff --git a/muse3/CMakeLists.txt b/muse3/CMakeLists.txt +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2746a50f..ebf97d10 100644 ---- a/muse3/CMakeLists.txt -+++ b/muse3/CMakeLists.txt +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt @@ -451,7 +451,6 @@ SET (AEFFECT_H_FOUND FALSE) SET (VST_NATIVE_SUPPORT FALSE) diff --git a/recipes-musicians/muse/muse/0002-muse-find-unused-wavs-convert-to-pythomn3.patch b/recipes-musicians/muse/muse/0002-muse-find-unused-wavs-convert-to-pythomn3.patch index f460fe1..3e2be9d 100644 --- a/recipes-musicians/muse/muse/0002-muse-find-unused-wavs-convert-to-pythomn3.patch +++ b/recipes-musicians/muse/muse/0002-muse-find-unused-wavs-convert-to-pythomn3.patch @@ -10,13 +10,13 @@ Upstream-Status: Pending Signed-off-by: Andreas Müller --- - muse3/utils/muse-find-unused-wavs | 46 +++++++++++++++---------------- + src/utils/muse-find-unused-wavs | 46 +++++++++++++++---------------- 1 file changed, 23 insertions(+), 23 deletions(-) -diff --git a/muse3/utils/muse-find-unused-wavs b/muse3/utils/muse-find-unused-wavs +diff --git a/src/utils/muse-find-unused-wavs b/src/utils/muse-find-unused-wavs index 5aaf2707..3bc4e009 100755 ---- a/muse3/utils/muse-find-unused-wavs -+++ b/muse3/utils/muse-find-unused-wavs +--- a/src/utils/muse-find-unused-wavs ++++ b/src/utils/muse-find-unused-wavs @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 From 437a84230ca7c15ae6c0a0dce08d65eb24fea32c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Thu, 29 Apr 2021 17:35:24 +0200 Subject: [PATCH 4/6] carla: Fix fetch - master branch is gone and main seems different MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- recipes-musicians/carla/carla_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-musicians/carla/carla_git.bb b/recipes-musicians/carla/carla_git.bb index b6054d4..0a27a29 100644 --- a/recipes-musicians/carla/carla_git.bb +++ b/recipes-musicians/carla/carla_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = " \ " SRC_URI = " \ - git://github.com/falkTX/Carla.git \ + git://github.com/falkTX/Carla.git;nobranch=1 \ file://0001-do-not-try-to-cross-run-carla-lv2-export.patch \ file://0002-Do-not-try-to-find-Qt5-host-bins-it-won-t-work.patch \ " From b3a2d70089f0d0b15a35c9ce3e2631da66879223 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Thu, 29 Apr 2021 18:07:10 +0200 Subject: [PATCH 5/6] Revert "gst-plugins-base: Fix build" This does not work on build hosts with make < 4.3 This reverts commit 2a3f8d01210715047c3005981c49fd42014bf2f9. --- .../0002-Fix-stray.patch | 169 ------------------ .../gst-plugins-base_0.10.36.bb | 1 - 2 files changed, 170 deletions(-) delete mode 100644 recipes-gstreamer/gstreamer-0.10/gst-plugins-base-0.10.36/0002-Fix-stray.patch diff --git a/recipes-gstreamer/gstreamer-0.10/gst-plugins-base-0.10.36/0002-Fix-stray.patch b/recipes-gstreamer/gstreamer-0.10/gst-plugins-base-0.10.36/0002-Fix-stray.patch deleted file mode 100644 index 076cc07..0000000 --- a/recipes-gstreamer/gstreamer-0.10/gst-plugins-base-0.10.36/0002-Fix-stray.patch +++ /dev/null @@ -1,169 +0,0 @@ -From eaabea6bb8242adb7bdf994b03283e6b627b7e4d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Mon, 26 Apr 2021 23:34:33 +0200 -Subject: [PATCH] Fix stray '\' -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Andreas Müller ---- - common/glib-gen.mak | 2 +- - common/gst-glib-gen.mak | 2 +- - gst-libs/gst/app/Makefile.in | 2 +- - gst-libs/gst/audio/Makefile.in | 2 +- - gst-libs/gst/interfaces/Makefile.in | 2 +- - gst-libs/gst/pbutils/Makefile.in | 2 +- - gst-libs/gst/rtsp/Makefile.in | 2 +- - gst-libs/gst/video/Makefile.in | 2 +- - gst/encoding/Makefile.in | 2 +- - gst/playback/Makefile.in | 2 +- - gst/tcp/Makefile.in | 2 +- - 11 files changed, 11 insertions(+), 11 deletions(-) - -diff --git a/common/glib-gen.mak b/common/glib-gen.mak -index ef93a5f..e43e126 100644 ---- a/common/glib-gen.mak -+++ b/common/glib-gen.mak -@@ -5,7 +5,7 @@ - #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#include \"$(h)\") - - # these are all the rules generating the relevant files - %-marshal.h: %-marshal.list -diff --git a/common/gst-glib-gen.mak b/common/gst-glib-gen.mak -index cc82bbd..a18d284 100644 ---- a/common/gst-glib-gen.mak -+++ b/common/gst-glib-gen.mak -@@ -6,7 +6,7 @@ - #glib_gen_prefix=gst_color_balance - #glib_gen_basename=colorbalance - --enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") -+enum_headers=$(foreach h,$(glib_enum_headers),\n#include \"$(h)\") - - # these are all the rules generating the relevant files - $(glib_gen_basename)-marshal.h: $(glib_gen_basename)-marshal.list -diff --git a/gst-libs/gst/app/Makefile.in b/gst-libs/gst/app/Makefile.in -index 8256253..89bbd45 100644 ---- a/gst-libs/gst/app/Makefile.in -+++ b/gst-libs/gst/app/Makefile.in -@@ -513,7 +513,7 @@ lib_LTLIBRARIES = libgstapp-@GST_MAJORMINOR@.la - glib_enum_define = GST_APP - glib_gen_prefix = __gst_app - glib_gen_basename = gstapp --enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") -+enum_headers = $(foreach h,$(glib_enum_headers),\n#include \"$(h)\") - built_sources = gstapp-marshal.c - built_headers = gstapp-marshal.h - BUILT_SOURCES = $(built_sources) $(built_headers) -diff --git a/gst-libs/gst/audio/Makefile.in b/gst-libs/gst/audio/Makefile.in -index 95c6585..c76a672 100644 ---- a/gst-libs/gst/audio/Makefile.in -+++ b/gst-libs/gst/audio/Makefile.in -@@ -594,7 +594,7 @@ libgstaudio_@GST_MAJORMINOR@_la_LIBADD = \ - $(GST_BASE_LIBS) $(GST_LIBS) - - libgstaudio_@GST_MAJORMINOR@_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#include \"$(h)\") - @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstAudio-@GST_MAJORMINOR@.gir - @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \ - @HAVE_INTROSPECTION_TRUE@ $(libgstaudio_@GST_MAJORMINOR@include_HEADERS)) \ -diff --git a/gst-libs/gst/interfaces/Makefile.in b/gst-libs/gst/interfaces/Makefile.in -index 5a0daff..283322e 100644 ---- a/gst-libs/gst/interfaces/Makefile.in -+++ b/gst-libs/gst/interfaces/Makefile.in -@@ -619,7 +619,7 @@ BUILT_SOURCES = \ - - EXTRA_DIST = interfaces-marshal.list - CLEANFILES = $(BUILT_SOURCES) $(am__append_1) --enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") -+enum_headers = $(foreach h,$(glib_enum_headers),\n#include \"$(h)\") - @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstInterfaces-@GST_MAJORMINOR@.gir - @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \ - @HAVE_INTROSPECTION_TRUE@ $(libgstinterfacesinclude_HEADERS)) \ -diff --git a/gst-libs/gst/pbutils/Makefile.in b/gst-libs/gst/pbutils/Makefile.in -index 49fae33..103df79 100644 ---- a/gst-libs/gst/pbutils/Makefile.in -+++ b/gst-libs/gst/pbutils/Makefile.in -@@ -608,7 +608,7 @@ CLEANFILES = $(BUILT_SOURCES) $(am__append_1) - - # 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#include \"$(h)\") - @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstPbutils-@GST_MAJORMINOR@.gir - @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \ - @HAVE_INTROSPECTION_TRUE@ $(libgstpbutils_@GST_MAJORMINOR@include_HEADERS)) \ -diff --git a/gst-libs/gst/rtsp/Makefile.in b/gst-libs/gst/rtsp/Makefile.in -index 089b245..edf0328 100644 ---- a/gst-libs/gst/rtsp/Makefile.in -+++ b/gst-libs/gst/rtsp/Makefile.in -@@ -579,7 +579,7 @@ glib_gen_prefix = __gst_rtsp - glib_enum_define = gst_rtsp - glib_enum_headers = gstrtspdefs.h - glib_gen_basename = gstrtsp --enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") -+enum_headers = $(foreach h,$(glib_enum_headers),\n#include \"$(h)\") - @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstRtsp-@GST_MAJORMINOR@.gir - @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \ - @HAVE_INTROSPECTION_TRUE@ $(libgstrtspinclude_HEADERS)) \ -diff --git a/gst-libs/gst/video/Makefile.in b/gst-libs/gst/video/Makefile.in -index ece09b8..f1249d5 100644 ---- a/gst-libs/gst/video/Makefile.in -+++ b/gst-libs/gst/video/Makefile.in -@@ -597,7 +597,7 @@ libgstvideo_@GST_MAJORMINOR@_la_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#include \"$(h)\") - @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstVideo-@GST_MAJORMINOR@.gir - @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \ - @HAVE_INTROSPECTION_TRUE@ $(libgstvideo_@GST_MAJORMINOR@include_HEADERS)) \ -diff --git a/gst/encoding/Makefile.in b/gst/encoding/Makefile.in -index ef779d3..2957fc9 100644 ---- a/gst/encoding/Makefile.in -+++ b/gst/encoding/Makefile.in -@@ -552,7 +552,7 @@ noinst_HEADERS = \ - BUILT_SOURCES = $(built_headers) $(built_sources) - EXTRA_DIST = gstencode-marshal.list - CLEANFILES = $(BUILT_SOURCES) --enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") -+enum_headers = $(foreach h,$(glib_enum_headers),\n#include \"$(h)\") - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - -diff --git a/gst/playback/Makefile.in b/gst/playback/Makefile.in -index f56b49d..cd9bd4a 100644 ---- a/gst/playback/Makefile.in -+++ b/gst/playback/Makefile.in -@@ -644,7 +644,7 @@ noinst_HEADERS = \ - BUILT_SOURCES = $(built_headers) $(built_sources) - EXTRA_DIST = gstplay-marshal.list - CLEANFILES = $(BUILT_SOURCES) --enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") -+enum_headers = $(foreach h,$(glib_enum_headers),\n#include \"$(h)\") - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - -diff --git a/gst/tcp/Makefile.in b/gst/tcp/Makefile.in -index 65e6408..1f4a879 100644 ---- a/gst/tcp/Makefile.in -+++ b/gst/tcp/Makefile.in -@@ -534,7 +534,7 @@ glib_enum_headers = gsttcp.h - glib_enum_define = GST_TCP - glib_gen_prefix = gst_tcp - glib_gen_basename = gsttcp --enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") -+enum_headers = $(foreach h,$(glib_enum_headers),\n#include \"$(h)\") - built_sources = gsttcp-enumtypes.c gsttcp-marshal.c - built_headers = gsttcp-enumtypes.h gsttcp-marshal.h - BUILT_SOURCES = $(built_sources) $(built_headers) --- -2.30.2 - diff --git a/recipes-gstreamer/gstreamer-0.10/gst-plugins-base_0.10.36.bb b/recipes-gstreamer/gstreamer-0.10/gst-plugins-base_0.10.36.bb index 26fc525..8ec304e 100644 --- a/recipes-gstreamer/gstreamer-0.10/gst-plugins-base_0.10.36.bb +++ b/recipes-gstreamer/gstreamer-0.10/gst-plugins-base_0.10.36.bb @@ -12,7 +12,6 @@ SRC_URI += "file://gst-plugins-base-tremor.patch \ file://configure.ac-fix-subparse-plugin.patch \ file://audioresample-Fix-build-on-x86-if-emmintrin.h-is-ava.patch \ file://0001-aclocal.m4-don-t-do-crazy-things-to-GLIB_CFLAGS.patch \ - file://0002-Fix-stray.patch \ " SRC_URI[md5sum] = "776c73883e567f67b9c4a2847d8d041a" From 7986ae195d547a135585ef899ab046b9ca70c36e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Thu, 29 Apr 2021 18:41:52 +0200 Subject: [PATCH 6/6] gst-plugins-base: fix build with host make version 4.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- .../gstreamer-0.10/gst-plugins-base_0.10.36.bb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/recipes-gstreamer/gstreamer-0.10/gst-plugins-base_0.10.36.bb b/recipes-gstreamer/gstreamer-0.10/gst-plugins-base_0.10.36.bb index 8ec304e..43ed00e 100644 --- a/recipes-gstreamer/gstreamer-0.10/gst-plugins-base_0.10.36.bb +++ b/recipes-gstreamer/gstreamer-0.10/gst-plugins-base_0.10.36.bb @@ -37,6 +37,13 @@ do_configure_prepend() { rm -f ${S}/m4/lib-link.m4 } +do_configure_append() { + # remove stay \ introduced by make 4.3 + if make -v | grep '4\.3'; then + sed -i 's:\\#include:#include:g' `find -name Makefile` + fi +} + FILES_${PN} += "${datadir}/${BPN}" CACHED_CONFIGUREVARS_append_x86 = " ac_cv_header_emmintrin_h=no ac_cv_header_xmmintrin_h=no"