From 2f86922c1a5818f7c1ba3feca79af3f1dc58a2e1 Mon Sep 17 00:00:00 2001 From: david Date: Tue, 12 Jun 2018 10:41:05 +0200 Subject: [PATCH 1/4] gst-plugins-base: convert to versionless bee-file --- gst-plugins-base-1.5.2-1.bee => gst-plugins-base.be0 | 2 ++ 1 file changed, 2 insertions(+) rename gst-plugins-base-1.5.2-1.bee => gst-plugins-base.be0 (98%) diff --git a/gst-plugins-base-1.5.2-1.bee b/gst-plugins-base.be0 similarity index 98% rename from gst-plugins-base-1.5.2-1.bee rename to gst-plugins-base.be0 index 0acc4f3fe..ae7d5e74f 100755 --- a/gst-plugins-base-1.5.2-1.bee +++ b/gst-plugins-base.be0 @@ -1,5 +1,7 @@ #!/usr/bin/env beesh +# BEE_VERSION gst-plugins-base-1.5.2-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.) From 4d5f00db7b7823196b4c4692f12466feda01fcd6 Mon Sep 17 00:00:00 2001 From: david Date: Tue, 12 Jun 2018 17:24:44 +0200 Subject: [PATCH 2/4] gst-plugins-base: Update from version 1.5.2 to 1.12.4 update so that gstreamer and the plugins are the same version --- gst-plugins-base.be0 | 76 +++++--------------------------------------- 1 file changed, 8 insertions(+), 68 deletions(-) diff --git a/gst-plugins-base.be0 b/gst-plugins-base.be0 index ae7d5e74f..f56febfb8 100755 --- a/gst-plugins-base.be0 +++ b/gst-plugins-base.be0 @@ -1,49 +1,18 @@ #!/usr/bin/env beesh -# BEE_VERSION gst-plugins-base-1.5.2-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.) - -############################################################################### -## 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. +# BEE_VERSION gst-plugins-base-1.12.4-0 SRCURL[0]="http://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. - -# PATCHURL+=() - -############################################################################### -## Add filename patterns to the EXCLUDE array of files that should not -## be added to you package but may be present in the image directory. +PATCHURL+=("/src/mariux/beeroot/downloads/gstreamer_makefile.patch") # EXCLUDE+=() -############################################################################### -## Uncomment the next statement, if the software may not be able to be build -## outside the source directory and need to be build inside the source -## directory. - # build_in_sourcedir -############################################################################### -## bee cannot detect buildtypes specified in subdirectories. -## Sometimes packages "hide" the real sources in a subdirectory named -## 'src' or 'cmake' or .. -## use 'sourcesubdir_append' to specify this directory if known. - # sourcesubdir_append src - -############################################################################### -## Change the default (auto-detected) steps to -## extract, patch, configure/setup, build and install the software. -## Make sure the mee_install function does install everything to the -## image directory "${D}" +#BEE_BUILDTYPE=meson #mee_extract() { # bee_extract "${@}" @@ -53,22 +22,11 @@ SRCURL[0]="http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-bas # 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 -##} +mee_configure() { + bee_configure \ + --with-package-name="GStreamer Base Plugins ${PKGVERSION} BLFS" \ + --with-package-origin="http://www.linuxfromscratch.org/blfs/view/svn/" +} #mee_build() { # bee_build @@ -78,21 +36,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/ -## From 723fb51d83fb9bd98b94d32519189b2c0fabd6ab Mon Sep 17 00:00:00 2001 From: david Date: Wed, 13 Jun 2018 09:37:04 +0200 Subject: [PATCH 3/4] gst-plugins-good: Convert to version-less bee-file delete old file and create new file from template --- gst-plugins-good-0.10.28-0.bee | 31 ------------------------------ gst-plugins-good.be0 | 35 ++++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 31 deletions(-) delete mode 100755 gst-plugins-good-0.10.28-0.bee create mode 100755 gst-plugins-good.be0 diff --git a/gst-plugins-good-0.10.28-0.bee b/gst-plugins-good-0.10.28-0.bee deleted file mode 100755 index a50e2e6b0..000000000 --- a/gst-plugins-good-0.10.28-0.bee +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/env beesh - -SRCURL[0]="http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.28.tar.bz2" - -PATCHURL[0]="" - -# BEE_CONFIGURE=compat - -# EXCLUDE="" - - - -mee_extract() { - bee_extract ${@} -} - -mee_patch() { - bee_patch ${@} -} - -mee_configure() { - bee_configure -} - -mee_build() { - bee_build -} - -mee_install() { - bee_install -} diff --git a/gst-plugins-good.be0 b/gst-plugins-good.be0 new file mode 100755 index 000000000..cd1ee0666 --- /dev/null +++ b/gst-plugins-good.be0 @@ -0,0 +1,35 @@ +#!/usr/bin/env beesh + +# BEE_VERSION gst-plugins-good-0.10.28-0 + +SRCURL[0]="http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PKGVERSION}.tar.bz2" + +# PATCHURL+=() + +# EXCLUDE+=() + +# build_in_sourcedir + +# sourcesubdir_append src + + +#mee_extract() { +# bee_extract "${@}" +#} + +#mee_patch() { +# bee_patch "${@}" +#} + +#mee_configure() { +# bee_configure +#} + +#mee_build() { +# bee_build +#} + +#mee_install() { +# bee_install +#} +## by default this may be 'make install DESTDIR="${D}"' From f3ebcc9590e891f42b1b241040b5c4e7495ab86d Mon Sep 17 00:00:00 2001 From: david Date: Wed, 13 Jun 2018 10:04:42 +0200 Subject: [PATCH 4/4] gst-plugins-good: Update from version 0.10.28 to 1.12.4 update so that gstreamer and the plugins are on the same version --- gst-plugins-good.be0 | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/gst-plugins-good.be0 b/gst-plugins-good.be0 index cd1ee0666..9dac03b3f 100755 --- a/gst-plugins-good.be0 +++ b/gst-plugins-good.be0 @@ -1,8 +1,8 @@ #!/usr/bin/env beesh -# BEE_VERSION gst-plugins-good-0.10.28-0 +# BEE_VERSION gst-plugins-good-1.12.4-1 -SRCURL[0]="http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PKGVERSION}.tar.bz2" +SRCURL[0]="http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PKGVERSION}.tar.xz" # PATCHURL+=() @@ -21,9 +21,11 @@ SRCURL[0]="http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-goo # bee_patch "${@}" #} -#mee_configure() { -# bee_configure -#} +mee_configure() { + bee_configure \ + --with-package-name="GStreamer Good Plugins ${PKGVERSION} BLFS" \ + --with-package-origin="http://www.linuxfromscratch.org/blfs/view/svn/" +} #mee_build() { # bee_build