From b2230dbf019f579d69b495868dd3e02b0c59654c Mon Sep 17 00:00:00 2001 From: Peter Marquardt Date: Wed, 18 Apr 2018 10:41:10 +0200 Subject: [PATCH] gst-plugins-base: update from 1.5.2 to 1.14.0 --- gst-plugins-base-0.10.32-0.bee | 35 ---------- ...s-base-1.5.2-1.bee => gst-plugins-base.be0 | 66 ++++++++----------- 2 files changed, 29 insertions(+), 72 deletions(-) delete mode 100755 gst-plugins-base-0.10.32-0.bee rename gst-plugins-base-1.5.2-1.bee => gst-plugins-base.be0 (56%) diff --git a/gst-plugins-base-0.10.32-0.bee b/gst-plugins-base-0.10.32-0.bee deleted file mode 100755 index 70922ad40..000000000 --- a/gst-plugins-base-0.10.32-0.bee +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/env beesh - -SRCURL[0]="http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-${PV}.tar.bz2" - -PATCHURL[0]="" - -PGRP=( uncategorized ) - - - -# BEE_CONFIGURE=compat - -# EXCLUDE="" - -mee_patch() { - bee_patch - - sed -ie 's/^ /\t/' \ - ${S}/docs/{libs,plugins}/Makefile.in - - -} - -mee_configure() { - bee_configure -} - -mee_build() { - bee_build -} - -mee_install() { - bee_install -} - diff --git a/gst-plugins-base-1.5.2-1.bee b/gst-plugins-base.be0 similarity index 56% rename from gst-plugins-base-1.5.2-1.bee rename to gst-plugins-base.be0 index 0acc4f3fe..b428907df 100755 --- a/gst-plugins-base-1.5.2-1.bee +++ b/gst-plugins-base.be0 @@ -1,5 +1,6 @@ #!/usr/bin/env beesh +# BEE_VERSION gst-plugins-base-1.14.0-1 ## this file was created by bee init and should be executed to build a ## bee-package. (Additional hints are located at the end of this file.) @@ -7,8 +8,7 @@ ## The source URL(s) define the location of the sources that will be ## downloaded. Version variables may be used to simplify reuse of this bee-file. -SRCURL[0]="http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-${PKGVERSION}.tar.xz" - +SRCURL[0]="https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-${PKGVERSION}.tar.xz" ############################################################################### ## Add URLs/pathes to patch files to the PATCHURL array. ## The sources will be patched in the order of the array. @@ -47,27 +47,37 @@ SRCURL[0]="http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-bas # bee_extract "${@}" #} +mee_extract_post() { + bee update --remove-all gstreamer-1.14 + bee remove gst-plugins-good-0.10.28-0.x86_64 + bee remove gst-plugins-base-0.10.32-0.x86_64 + bee remove gst-plugins-base-1.5.2-1.x86_64 +} + #mee_patch() { # bee_patch "${@}" #} -##mee_configure() { -## -## # application wants qt5 and configure will add -I"/usr/local/include/QtGui -I/usr/local/include/QtCore -I/usr/local/include/QtWidgets" -## # however, we have -## # /usr/local/include/QtGui/qapplication.h from qt4 -## # /usr/local/include/QtWidgets/qapplication.h from qt5 -## # qt4 had QApplication::setQuitOnLastWindowClosed(bool) as a class method, -## # qt5 has QApplication::setQuitOnLastWindowClosed(bool) innerited from QGuiApplication::setQuitOnLastWindowClosed(bool) -## # so with the order by configure we have /usr/local/include/QtWidgets/qapplication.h masked by obsolete /usr/local/include/QtGui/qapplication.h -## # and will undefined symbol get QApplication::setQuitOnLastWindowClosed(bool) at link time -## # so make sure, we see /usr/local/include/QtWidgets first. -## -## export CPPFLAGS='-I/usr/local/include/QtWidgets' -## -## bee_configure -##} - +# disable example builds because sdl does not search its libs ${B}: +# +#make[5]: Entering directory '/scratch/local/bee-root/gst-plugins-base/gst-plugins-base-1.14.0-0/build/tests/examples/gl/sdl' +# CC sdlshare-sdlshare.o +# CCLD sdlshare +#/usr/lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../../../x86_64-pc-linux-gnu/bin/ld: cannot find -lgstvideo-1.0 +#collect2: error: ld returned 1 exit status +#Makefile:658: recipe for target 'sdlshare' failed +#make[5]: *** [sdlshare] Error 1 + +mee_configure() { + bee_configure "${@}" \ + --prefix=${PREFIX} \ + --with-package-name="GStreamer Base Plugins 1.14.0 BLFS" \ + --with-package-origin="http://www.linuxfromscratch.org/blfs/view/svn/" \ + --disable-examples +} + + +# we still get tons of "/usr/include/GL/gl.h:1922: syntax error, unexpected ..." errors while building GstGL-1.0.gir etc #mee_build() { # bee_build #} @@ -76,21 +86,3 @@ SRCURL[0]="http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-bas # bee_install #} ## by default this may be 'make install DESTDIR="${D}"' - -############################################################################### -## -## Additional hints: -## -## The name of this bee-file should follow the following naming convention: -## pkgname-pkgversion-pkgrevision.bee -## -## You may remove all comments as long as SRCURL[0]="" is set. -## -## Everything in this file will be executed in a bash environment. -## -## Build the package by executing -## './pkg-version-N.bee' or -## 'beesh ./pkg-version-N.bee' -## -## see http://beezinga.org/ -##