From 75455801d2fe299a95773ea6e5bfd19b3e196055 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Wed, 7 Jun 2017 21:33:59 +1000 Subject: [PATCH] gst_plugins_base: fix build. --- .../gst_plugins_base-0.10.36.recipe | 48 +++++++++++++++---- .../patches/gst_plugins_base_0.10.36.patchset | 38 +++++++++++++++ 2 files changed, 76 insertions(+), 10 deletions(-) create mode 100644 media-libs/gst_plugins_base/patches/gst_plugins_base_0.10.36.patchset diff --git a/media-libs/gst_plugins_base/gst_plugins_base-0.10.36.recipe b/media-libs/gst_plugins_base/gst_plugins_base-0.10.36.recipe index 28a1be352..82b8fcbe0 100644 --- a/media-libs/gst_plugins_base/gst_plugins_base-0.10.36.recipe +++ b/media-libs/gst_plugins_base/gst_plugins_base-0.10.36.recipe @@ -7,20 +7,36 @@ filters are included." HOMEPAGE="http://gstreamer.freedesktop.org/" COPYRIGHT="Erik Walthinsen" LICENSE="GNU LGPL v2" -REVISION="2" +REVISION="3" SOURCE_URI="http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-$portVersion.tar.xz" CHECKSUM_SHA256="1fe45c3894903001d4d008b0713dab089f53726dcb5842d5b40c2595a984e64a" SOURCE_DIR="gst-plugins-base-$portVersion" +PATCHES="gst_plugins_base_$portVersion.patchset" ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64" SECONDARY_ARCHITECTURES="x86" PROVIDES=" - gst_plugins_base${secondaryArchSuffix} = $portVersion + gst_plugins_base_0.10$secondaryArchSuffix = $portVersion + cmd:gst_discoverer_0.10$secondaryArchSuffix = $portVersion + cmd:gst_visualise_0.10$secondaryArchSuffix = $portVersion + lib:libgstapp_0.10$secondaryArchSuffix = $portVersion + lib:libgstaudio_0.10$secondaryArchSuffix = $portVersion + lib:libgstcdda_0.10$secondaryArchSuffix = $portVersion + lib:libgstinterfaces_0.10$secondaryArchSuffix = $portVersion + lib:libgstnetbuffer_0.10$secondaryArchSuffix = $portVersion + lib:libgstpbutils_0.10$secondaryArchSuffix = $portVersion + lib:libgstriff_0.10$secondaryArchSuffix = $portVersion + lib:libgstrtp_0.10$secondaryArchSuffix = $portVersion + lib:libgstrtsp_0.10$secondaryArchSuffix = $portVersion + lib:libgstsdp_0.10$secondaryArchSuffix = $portVersion + lib:libgsttag_0.10$secondaryArchSuffix = $portVersion + lib:libgstfft_0.10$secondaryArchSuffix = $portVersion + lib:libgstvideo_0.10$secondaryArchSuffix = $portVersion " REQUIRES=" haiku$secondaryArchSuffix - lib:libgstreamer$secondaryArchSuffix + lib:libgstreamer_0.10$secondaryArchSuffix lib:libz$secondaryArchSuffix lib:libxml2$secondaryArchSuffix lib:libogg$secondaryArchSuffix @@ -35,16 +51,29 @@ REQUIRES=" " PROVIDES_devel=" - gst_plugins_base${secondaryArchSuffix}_devel = $portVersion + gst_plugins_base_0.10${secondaryArchSuffix}_devel = $portVersion + devel:libgstapp_0.10$secondaryArchSuffix = $portVersion + devel:libgstaudio_0.10$secondaryArchSuffix = $portVersion + devel:libgstcdda_0.10$secondaryArchSuffix = $portVersion + devel:libgstinterfaces_0.10$secondaryArchSuffix = $portVersion + devel:libgstnetbuffer_0.10$secondaryArchSuffix = $portVersion + devel:libgstpbutils_0.10$secondaryArchSuffix = $portVersion + devel:libgstriff_0.10$secondaryArchSuffix = $portVersion + devel:libgstrtp_0.10$secondaryArchSuffix = $portVersion + devel:libgstrtsp_0.10$secondaryArchSuffix = $portVersion + devel:libgstsdp_0.10$secondaryArchSuffix = $portVersion + devel:libgsttag_0.10$secondaryArchSuffix = $portVersion + devel:libgstfft_0.10$secondaryArchSuffix = $portVersion + devel:libgstvideo_0.10$secondaryArchSuffix = $portVersion " REQUIRES_devel=" - gst_plugins_base${secondaryArchSuffix} + gst_plugins_base_0.10${secondaryArchSuffix} haiku$secondaryArchSuffix " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - devel:libgstreamer$secondaryArchSuffix + devel:libgstreamer_0.10$secondaryArchSuffix devel:libfreetype$secondaryArchSuffix devel:libglib_2.0$secondaryArchSuffix devel:libz$secondaryArchSuffix @@ -58,7 +87,6 @@ BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:pkg_config$secondaryArchSuffix - cmd:libtool cmd:aclocal cmd:autoconf cmd:libtoolize$secondaryArchSuffix @@ -74,8 +102,8 @@ BUILD_PREREQUIRES=" BUILD() { runConfigure ./configure --disable-examples --disable-debug --disable-nls \ - --with-default-audiosink=sdlaudiosink --with-default-videosink=sdlvideosink - find -type f -name '*' -exec sed -i 's/-lpthread/-lroot/g' {} \; + --with-default-audiosink=sdlaudiosink --with-default-videosink=sdlvideosink \ + --with-audioresample-format=int make $jobArgs } @@ -85,7 +113,7 @@ INSTALL() prepareInstalledDevelLibs libgstvideo-0.10 libgsttag-0.10 libgstsdp-0.10 libgstrtsp-0.10 \ libgstriff-0.10 libgstpbutils-0.10 libgstnetbuffer-0.10 libgstinterfaces-0.10 \ - libgstfft-0.10 libgstcdda-0.10 libgstaudio-0.10 libgstapp-0.10 + libgstfft-0.10 libgstcdda-0.10 libgstaudio-0.10 libgstapp-0.10 libgstrtp-0.10 fixPkgconfig diff --git a/media-libs/gst_plugins_base/patches/gst_plugins_base_0.10.36.patchset b/media-libs/gst_plugins_base/patches/gst_plugins_base_0.10.36.patchset new file mode 100644 index 000000000..f1a09775d --- /dev/null +++ b/media-libs/gst_plugins_base/patches/gst_plugins_base_0.10.36.patchset @@ -0,0 +1,38 @@ +From ac490e61a42863d1018d9e7f00013c7fcd3ba1cc Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Tue, 30 May 2017 20:11:04 +1000 +Subject: Disable SSE for Haiku + + +diff --git a/gst/audioresample/speex_resampler_double.c b/gst/audioresample/speex_resampler_double.c +index ef2503d..e350218 100644 +--- a/gst/audioresample/speex_resampler_double.c ++++ b/gst/audioresample/speex_resampler_double.c +@@ -17,7 +17,9 @@ + * Boston, MA 02111-1307, USA. + */ + ++#ifndef __HAIKU__ + #define _USE_SSE2 ++#endif + #define FLOATING_POINT + #define DOUBLE_PRECISION + #define OUTSIDE_SPEEX +diff --git a/gst/audioresample/speex_resampler_float.c b/gst/audioresample/speex_resampler_float.c +index ef3df15..836b854 100644 +--- a/gst/audioresample/speex_resampler_float.c ++++ b/gst/audioresample/speex_resampler_float.c +@@ -17,8 +17,10 @@ + * Boston, MA 02111-1307, USA. + */ + ++#ifndef __HAIKU__ + #define _USE_SSE + #define _USE_SSE2 ++#endif + #define FLOATING_POINT + #define OUTSIDE_SPEEX + #define RANDOM_PREFIX resample_float +-- +2.7.0 +