From c4fe0ae12249d87e3381df5a13bd1ef7bf6c8813 Mon Sep 17 00:00:00 2001 From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com> Date: Mon, 6 Jul 2020 22:20:17 +0800 Subject: [PATCH] gstreamer1: update to 1.16.2 Fix dependencies build errors: meson: update to 0.54.2 intltool: update to 0.51 libv4l: update to 1.20 libwebp: add package gst1-libav/ gst1-plugins-bad/ gst1-plugins-base/ gst1-plugins-good/ gst1-plugins-ugly/ gstreamer1: update to 1.16.2 --- devel/meson/Makefile | 8 +- devel/meson/meson.mk | 10 +- ...-RPATH-if-install_rpath-is-not-empty.patch | 34 +++ devel/meson/src/openwrt-cross.txt.in | 4 +- devel/meson/src/openwrt-native.txt.in | 4 +- libs/intltool/Makefile | 18 +- .../100-optional-perl-xml-parser.patch | 14 +- .../200-intltool-0.51.0-perl-5.22.patch | 48 +++ libs/libv4l/Makefile | 45 +-- .../patches/010-remove-libudev-check.patch | 22 ++ .../patches/020-add-missing-includes.patch | 36 +-- .../patches/030-dont-call-getsubopt.patch | 28 -- libs/libwebp/Makefile | 57 ++++ libs/libwebp/patches/010-mips16.patch | 11 + multimedia/gst1-libav/Makefile | 38 ++- multimedia/gst1-plugins-bad/Makefile | 282 +++++++++++++----- .../patches/001-no-translations.patch | 28 -- .../patches/002-no-tests.patch | 59 ---- multimedia/gst1-plugins-base/Makefile | 99 +++--- .../patches/001-no-translations.patch | 30 -- .../patches/002-no-tests.patch | 47 --- .../patches/003-no-docs.patch | 31 -- multimedia/gst1-plugins-good/Makefile | 152 ++++++---- .../patches/001-no-translations.patch | 22 -- .../patches/002-no-tests.patch | 35 --- .../patches/003-no-docs.patch | 24 -- multimedia/gst1-plugins-ugly/Makefile | 80 ++--- .../patches/001-no-translations.patch | 23 -- .../patches/002-no-tests.patch | 25 -- .../patches/003-no-docs.patch | 25 -- multimedia/gstreamer1/Makefile | 71 +++-- .../patches/001-no-translations.patch | 30 +- .../gstreamer1/patches/002-no-tests.patch | 45 --- .../gstreamer1/patches/003-no-docs.patch | 35 --- ...10-gstplugin-use-lazy-symbol-binding.patch | 2 +- 35 files changed, 717 insertions(+), 805 deletions(-) create mode 100644 devel/meson/patches/010-Only-fix-RPATH-if-install_rpath-is-not-empty.patch create mode 100644 libs/intltool/patches/200-intltool-0.51.0-perl-5.22.patch create mode 100644 libs/libv4l/patches/010-remove-libudev-check.patch delete mode 100644 libs/libv4l/patches/030-dont-call-getsubopt.patch create mode 100644 libs/libwebp/Makefile create mode 100644 libs/libwebp/patches/010-mips16.patch delete mode 100644 multimedia/gst1-plugins-bad/patches/001-no-translations.patch delete mode 100644 multimedia/gst1-plugins-bad/patches/002-no-tests.patch delete mode 100644 multimedia/gst1-plugins-base/patches/001-no-translations.patch delete mode 100644 multimedia/gst1-plugins-base/patches/002-no-tests.patch delete mode 100644 multimedia/gst1-plugins-base/patches/003-no-docs.patch delete mode 100644 multimedia/gst1-plugins-good/patches/001-no-translations.patch delete mode 100644 multimedia/gst1-plugins-good/patches/002-no-tests.patch delete mode 100644 multimedia/gst1-plugins-good/patches/003-no-docs.patch delete mode 100644 multimedia/gst1-plugins-ugly/patches/001-no-translations.patch delete mode 100644 multimedia/gst1-plugins-ugly/patches/002-no-tests.patch delete mode 100644 multimedia/gst1-plugins-ugly/patches/003-no-docs.patch delete mode 100644 multimedia/gstreamer1/patches/002-no-tests.patch delete mode 100644 multimedia/gstreamer1/patches/003-no-docs.patch diff --git a/devel/meson/Makefile b/devel/meson/Makefile index 9cf7fd3a..16be7f35 100644 --- a/devel/meson/Makefile +++ b/devel/meson/Makefile @@ -1,12 +1,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=meson -PKG_VERSION:=0.52.0 +PKG_VERSION:=0.54.2 PKG_RELEASE:=1 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://github.com/mesonbuild/meson/releases/download/$(PKG_VERSION)/ -PKG_HASH:=d60f75f0dedcc4fd249dbc7519d6f3ce6df490033d276ef1cf27453ef4938d32 +PYPI_NAME:=meson +PKG_HASH:=a7716eeae8f8dff002e4147642589ab6496ff839e4376a5aed761f83c1fa0455 PKG_MAINTAINER:=Andre Heider PKG_LICENSE:=Apache-2.0 @@ -14,6 +13,7 @@ PKG_LICENSE_FILES:=COPYING HOST_BUILD_DEPENDS:=ninja/host +include ../../lang/python/pypi.mk include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/package.mk include ../../lang/python/python3-package.mk diff --git a/devel/meson/meson.mk b/devel/meson/meson.mk index 7645284a..0a261ca6 100644 --- a/devel/meson/meson.mk +++ b/devel/meson/meson.mk @@ -42,8 +42,8 @@ endef define Meson/CreateNativeFile $(STAGING_DIR_HOST)/bin/sed \ - -e "s|@CC@|$(HOSTCC)|" \ - -e "s|@CXX@|$(HOSTCXX)|" \ + -e "s|@CC@|$(foreach BIN,$(HOSTCC),'$(BIN)',)|" \ + -e "s|@CXX@|$(foreach BIN,$(HOSTCXX),'$(BIN)',)|" \ -e "s|@PKGCONFIG@|$(PKG_CONFIG)|" \ -e "s|@CFLAGS@|$(foreach FLAG,$(HOST_CFLAGS) $(HOST_CPPFLAGS),'$(FLAG)',)|" \ -e "s|@CXXFLAGS@|$(foreach FLAG,$(HOST_CXXFLAGS) $(HOST_CPPFLAGS),'$(FLAG)',)|" \ @@ -55,8 +55,8 @@ endef define Meson/CreateCrossFile $(STAGING_DIR_HOST)/bin/sed \ - -e "s|@CC@|$(TARGET_CC)|" \ - -e "s|@CXX@|$(TARGET_CXX)|" \ + -e "s|@CC@|$(foreach BIN,$(TARGET_CC),'$(BIN)',)|" \ + -e "s|@CXX@|$(foreach BIN,$(TARGET_CXX),'$(BIN)',)|" \ -e "s|@AR@|$(TARGET_AR)|" \ -e "s|@STRIP@|$(TARGET_CROSS)strip|" \ -e "s|@NM@|$(TARGET_NM)|" \ @@ -103,7 +103,7 @@ define Build/Configure/Meson --cross-file $(PKG_BUILD_DIR)/openwrt-cross.txt \ $(MESON_ARGS) \ $(MESON_BUILD_DIR) \ - $(PKG_BUILD_DIR), \ + $(MESON_BUILD_DIR)/.., \ $(MESON_VARS)) endef diff --git a/devel/meson/patches/010-Only-fix-RPATH-if-install_rpath-is-not-empty.patch b/devel/meson/patches/010-Only-fix-RPATH-if-install_rpath-is-not-empty.patch new file mode 100644 index 00000000..c5651d26 --- /dev/null +++ b/devel/meson/patches/010-Only-fix-RPATH-if-install_rpath-is-not-empty.patch @@ -0,0 +1,34 @@ +From 4db4fd79d9bb2b98cea1117f22b6c97942ab2ecd Mon Sep 17 00:00:00 2001 +From: Eric Le Bihan +Date: Sat, 14 Jul 2018 11:18:45 +0200 +Subject: [PATCH] Only fix RPATH if install_rpath is not empty + +Signed-off-by: Eric Le Bihan +[Fix: remove leftover from original/unconditional code] +Signed-off-by: Peter Seiderer +--- + mesonbuild/minstall.py | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py +index 8ac6aab1..7ef04116 100644 +--- a/mesonbuild/minstall.py ++++ b/mesonbuild/minstall.py +@@ -508,8 +508,14 @@ class Installer: + if file_copied: + self.did_install_something = True + try: +- depfixer.fix_rpath(outname, install_rpath, final_path, +- install_name_mappings, verbose=False) ++ # Buildroot check-host-rpath script expects RPATH ++ # But if install_rpath is empty, it will stripped. ++ # So, preserve it in this case ++ if install_rpath: ++ depfixer.fix_rpath(outname, install_rpath, final_path, ++ install_name_mappings, verbose=False) ++ else: ++ print("Skipping RPATH fixing") + except SystemExit as e: + if isinstance(e.code, int) and e.code == 0: + pass + diff --git a/devel/meson/src/openwrt-cross.txt.in b/devel/meson/src/openwrt-cross.txt.in index 63640585..f8c2db9d 100644 --- a/devel/meson/src/openwrt-cross.txt.in +++ b/devel/meson/src/openwrt-cross.txt.in @@ -1,6 +1,6 @@ [binaries] -c = '@CC@' -cpp = '@CXX@' +c = [@CC@] +cpp = [@CXX@] ar = '@AR@' strip = '@STRIP@' nm = '@NM@' diff --git a/devel/meson/src/openwrt-native.txt.in b/devel/meson/src/openwrt-native.txt.in index 30990eb3..e5d5a261 100644 --- a/devel/meson/src/openwrt-native.txt.in +++ b/devel/meson/src/openwrt-native.txt.in @@ -1,6 +1,6 @@ [binaries] -c = '@CC@' -cpp = '@CXX@' +c = [@CC@] +cpp = [@CXX@] pkgconfig = '@PKGCONFIG@' [properties] diff --git a/libs/intltool/Makefile b/libs/intltool/Makefile index cebae537..244f5999 100644 --- a/libs/intltool/Makefile +++ b/libs/intltool/Makefile @@ -1,6 +1,4 @@ # -# Copyright (C) 2009-2014 OpenWrt.org -# # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # @@ -8,26 +6,30 @@ include $(TOPDIR)/rules.mk PKG_NAME:=intltool -PKG_LIBVER:=0.40 -PKG_VERSION:=$(PKG_LIBVER).6 +PKG_VERSION:=0.51.0 PKG_RELEASE:=3 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=@GNOME/intltool/$(PKG_LIBVER) -PKG_HASH:=4d1e5f8561f09c958e303d4faa885079a5e173a61d28437d0013ff5efc9e3b64 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=https://launchpad.net/intltool/trunk/$(PKG_VERSION)/+download +PKG_HASH:=67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd PKG_MAINTAINER:=Ted Hess + +HOST_BUILD_DEPENDS:=perl/host PKG_HOST_ONLY:=1 HOST_FIXUP:=autoreconf include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/package.mk +HOST_CONFIGURE_VARS+= \ + PATH="$(STAGING_DIR_HOSTPKG)/bin:$(STAGING_DIR_HOSTPKG)/usr/bin:$(PATH)" + define Package/intltool SECTION:=libs CATEGORY:=Libraries TITLE:=set of tools to centralize translation using GNU gettext - URL:=http://www.freedesktop.org/wiki/Software/intltool + URL:=https://www.freedesktop.org/wiki/Software/intltool BUILDONLY:=1 endef diff --git a/libs/intltool/patches/100-optional-perl-xml-parser.patch b/libs/intltool/patches/100-optional-perl-xml-parser.patch index 4615d1d9..32474ba7 100644 --- a/libs/intltool/patches/100-optional-perl-xml-parser.patch +++ b/libs/intltool/patches/100-optional-perl-xml-parser.patch @@ -1,22 +1,22 @@ ---- a/configure.in -+++ b/configure.in -@@ -25,7 +25,7 @@ AC_MSG_CHECKING([for XML::Parser]) +--- a/configure.ac ++++ b/configure.ac +@@ -27,7 +27,7 @@ AC_MSG_CHECKING([for XML::Parser]) if `$PERL -e "require XML::Parser" 2>/dev/null`; then AC_MSG_RESULT([ok]) else - AC_MSG_ERROR([XML::Parser perl module is required for intltool]) -+ AC_MSG_RESULT([XML::Parser perl module is required for some intltool utilitities]) ++ AC_MSG_RESULT([XML::Parser perl module is required for intltool]) fi + AC_PATH_PROG(BZR, bzr) - AC_OUTPUT([ --- a/intltool.m4 +++ b/intltool.m4 -@@ -127,7 +127,7 @@ if test "x$2" != "xno-xml"; then +@@ -148,7 +148,7 @@ if test "x$2" != "xno-xml"; then if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then AC_MSG_RESULT([ok]) else - AC_MSG_ERROR([XML::Parser perl module is required for intltool]) -+ AC_MSG_RESULT([XML::Parser perl module is required for some intltool utilitities]) ++ AC_MSG_RESULT([XML::Parser perl module is required for intltool]) fi fi diff --git a/libs/intltool/patches/200-intltool-0.51.0-perl-5.22.patch b/libs/intltool/patches/200-intltool-0.51.0-perl-5.22.patch new file mode 100644 index 00000000..097c511c --- /dev/null +++ b/libs/intltool/patches/200-intltool-0.51.0-perl-5.22.patch @@ -0,0 +1,48 @@ +https://bugs.launchpad.net/intltool/+bug/1490906 + +fix warnings w/newer perl: +Unescaped left brace in regex is deprecated, passed through in regex; marked by <-- HERE in m/^(.*)\${ <-- HERE ?([A-Z_]+)}?(.*)$/ at /usr/bin/intltool-update line 1065. + +--- a/intltool-update.in ++++ b/intltool-update.in +@@ -1062,7 +1062,7 @@ + } + } + +- if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/) ++ if ($str =~ /^(.*)\$\{?([A-Z_]+)}?(.*)$/) + { + my $rest = $3; + my $untouched = $1; +@@ -1190,10 +1190,10 @@ + $name =~ s/\(+$//g; + $version =~ s/\(+$//g; + +- $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/); +- $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/); +- $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/); +- $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/); ++ $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/); ++ $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/); ++ $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/); ++ $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/); + } + + if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)[,]?([^,\)]+)?/m) +@@ -1219,11 +1219,11 @@ + $version =~ s/\(+$//g; + $bugurl =~ s/\(+$//g if (defined $bugurl); + +- $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/); +- $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/); +- $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/); +- $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/); +- $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\${?\w+}?/); ++ $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/); ++ $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/); ++ $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/); ++ $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/); ++ $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\$\{?\w+}?/); + } + + # \s makes this not work, why? diff --git a/libs/libv4l/Makefile b/libs/libv4l/Makefile index d9a4d8c6..54dfb436 100644 --- a/libs/libv4l/Makefile +++ b/libs/libv4l/Makefile @@ -1,7 +1,4 @@ # -# Copyright (C) 2009-2015 OpenWrt.org -# Copyright (C) 2009 David Cooper -# # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # @@ -9,23 +6,21 @@ include $(TOPDIR)/rules.mk PKG_NAME:=v4l-utils -PKG_VERSION:=1.10.0 +PKG_VERSION:=1.20.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=http://www.linuxtv.org/downloads/v4l-utils -PKG_HASH:=78ead27ee58a701d7c6342303cf4520bdd4a2b88a7813bc99a0b389307e4336b +PKG_SOURCE_URL:=https://www.linuxtv.org/downloads/v4l-utils +PKG_HASH:=956118713f7ccb405c55c7088a6a2490c32d54300dd9a30d8d5008c28d3726f7 PKG_MAINTAINER:=Ted Hess -PKG_LICENSE:=GPL-2.0 LGPL-2.1 -PKG_LICENSE_FILES:=COPYING COPYING.libv4l - PKG_USE_MIPS16:=0 PKG_FIXUP:=autoreconf PKG_INSTALL:=1 +PKG_BUILD_PARALLEL:=1 -PKG_BUILD_DEPENDS:=argp-standalone +PKG_BUILD_DEPENDS:=!USE_GLIBC:argp-standalone include $(INCLUDE_DIR)/uclibc++.mk include $(INCLUDE_DIR)/package.mk @@ -33,7 +28,7 @@ include $(INCLUDE_DIR)/nls.mk define Package/libv4l/Default TITLE:=Video 4 Linux - URL:=http://www.linuxtv.org/ + URL:=https://www.linuxtv.org/ endef define Package/libv4l/Default/description @@ -57,6 +52,8 @@ define Package/libv4l CATEGORY:=Libraries TITLE+= wrapper libraries DEPENDS := +libpthread +librt $(ICONV_DEPENDS) + LICENSE:=LGPL-2.1-or-later + LICENSE_FILES:=COPYING.libv4l endef define Package/libv4l/description @@ -68,7 +65,9 @@ define Package/v4l-utils SECTION:=utils CATEGORY:=Utilities TITLE+= utilities - DEPENDS := +libv4l $(CXX_DEPENDS) $(ICONV_DEPENDS) + DEPENDS:= +libv4l $(CXX_DEPENDS) $(ICONV_DEPENDS) $(INTL_DEPENDS) + LICENSE:=GPL-2.0-or-later + LICENSE_FILES:=COPYING endef define Package/v4l-utils/description @@ -76,27 +75,32 @@ define Package/v4l-utils/description This package contains the video4linux utilities. endef -TARGET_CFLAGS += $(FPIC) -TARGET_LDFLAGS += -largp +TARGET_CFLAGS += -flto +TARGET_CXXFLAGS += -std=c++11 +TARGET_LDFLAGS += \ + $(if $(CONFIG_LIBC_USE_GLIBC),,-largp) \ + -Wl,--gc-sections,--as-needed CONFIGURE_ARGS+= \ + --disable-bpf \ --disable-doxygen-doc \ --disable-libdvbv5 \ --disable-qv4l2 \ - --without-jpeg \ + --disable-qvidcap \ + --without-jpeg define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include $(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(1)/usr/include/ $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libv4l{1,2,convert}.{a,so*} $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libv4l{1,2,convert,2rds}.{a,so*} $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libv4l{1,2,convert}.pc $(1)/usr/lib/pkgconfig/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libv4l{1,2,convert,2rds}.pc $(1)/usr/lib/pkgconfig/ endef define Package/libv4l/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libv4l{1,2,convert}.so.* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libv4l{1,2,convert,2rds}.so.* $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/lib/libv4l $(CP) $(PKG_INSTALL_DIR)/usr/lib/libv4l/v4l{1compat,2convert}.so $(1)/usr/lib/libv4l/ endef @@ -106,10 +110,11 @@ define Package/v4l-utils/install $(CP) $(PKG_INSTALL_DIR)/etc/rc_maps.cfg $(1)/etc/ $(CP) $(PKG_INSTALL_DIR)/etc/rc_keymaps $(1)/etc/ $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/{cx18,ivtv}-ctl $(1)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/{rds,media,cx18,ivtv}-ctl $(1)/usr/bin/ $(CP) $(PKG_INSTALL_DIR)/usr/bin/decode_tm6000 $(1)/usr/bin/ - $(CP) $(PKG_INSTALL_DIR)/usr/bin/ir-keytable $(1)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/ir-{ctl,keytable} $(1)/usr/bin/ $(CP) $(PKG_INSTALL_DIR)/usr/bin/v4l2-{compliance,ctl,sysfs-path} $(1)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/cec-{compliance,ctl,follower} $(1)/usr/bin/ endef $(eval $(call BuildPackage,libv4l)) diff --git a/libs/libv4l/patches/010-remove-libudev-check.patch b/libs/libv4l/patches/010-remove-libudev-check.patch new file mode 100644 index 00000000..2e55aa28 --- /dev/null +++ b/libs/libv4l/patches/010-remove-libudev-check.patch @@ -0,0 +1,22 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -309,16 +309,9 @@ else + AC_MSG_WARN(ALSA library not available) + fi + +-PKG_CHECK_MODULES(libudev, libudev, have_libudev=yes, have_libudev=no) +-if test "x$have_libudev" = "xyes"; then +- AC_DEFINE([HAVE_LIBUDEV], [], [Use libudev]) +- LIBUDEV_CFLAGS="$libudev_CFLAGS" +- LIBUDEV_LIBS="$libudev_LIBS" +- AC_SUBST(LIBUDEV_CFLAGS) +- AC_SUBST(LIBUDEV_LIBS) +-else +- AC_MSG_WARN(udev library not available) +-fi ++ ++# Force building without udev ++have_libudev=no + + AC_SUBST([JPEG_LIBS]) + diff --git a/libs/libv4l/patches/020-add-missing-includes.patch b/libs/libv4l/patches/020-add-missing-includes.patch index 34e0511a..c5a83a97 100644 --- a/libs/libv4l/patches/020-add-missing-includes.patch +++ b/libs/libv4l/patches/020-add-missing-includes.patch @@ -1,28 +1,10 @@ ---- a/utils/rds-ctl/rds-ctl.cpp -+++ b/utils/rds-ctl/rds-ctl.cpp -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -36,6 +37,7 @@ - #include - #include - #include -+#include - - #include - #include ---- a/utils/v4l2-ctl/v4l2-ctl-streaming.cpp -+++ b/utils/v4l2-ctl/v4l2-ctl-streaming.cpp -@@ -14,6 +14,7 @@ - #include - #include - #include -+#include - - #include "v4l2-ctl.h" +--- a/utils/libcecutil/cec-info.cpp ++++ b/utils/libcecutil/cec-info.cpp +@@ -5,6 +5,7 @@ + * Copyright 2017 Cisco Systems, Inc. and/or its affiliates. All rights reserved. + */ ++#include + #include + #include + #include diff --git a/libs/libv4l/patches/030-dont-call-getsubopt.patch b/libs/libv4l/patches/030-dont-call-getsubopt.patch deleted file mode 100644 index 5824c704..00000000 --- a/libs/libv4l/patches/030-dont-call-getsubopt.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/utils/v4l2-ctl/v4l2-ctl-common.cpp -+++ b/utils/v4l2-ctl/v4l2-ctl-common.cpp -@@ -671,15 +671,18 @@ static bool parse_subset(char *optarg) - - static bool parse_next_subopt(char **subs, char **value) - { -- static char *const subopts[] = { -- NULL -- }; -- int opt = getsubopt(subs, subopts, value); -+ char *stmp = *subs; -+ *value = NULL; - -- if (opt < 0 || *value) -+ if (*subs) { -+ *subs = strchr(stmp, ','); -+ if (*subs) -+ *(*subs)++ = 0; -+ else *subs = stmp + strlen(stmp); -+ -+ *value = stmp; - return false; -- fprintf(stderr, "No value given to suboption <%s>\n", -- subopts[opt]); -+ } - return true; - } - diff --git a/libs/libwebp/Makefile b/libs/libwebp/Makefile new file mode 100644 index 00000000..34510345 --- /dev/null +++ b/libs/libwebp/Makefile @@ -0,0 +1,57 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=libwebp +PKG_VERSION:=1.1.0 +PKG_RELEASE:=2 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=https://storage.googleapis.com/downloads.webmproject.org/releases/webp +PKG_HASH:=98a052268cc4d5ece27f76572a7f50293f439c17a98e67c4ea0c7ed6f50ef043 + +PKG_MAINTAINER:= +PKG_LICENSE:=BSD-3-Clause +PKG_LICENSE_FILES:=COPYING + +CMAKE_INSTALL:=1 +PKG_BUILD_PARALLEL:=1 + +include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/cmake.mk + +define Package/libwebp + SECTION:=libs + CATEGORY:=Libraries + TITLE:=WebP library + URL:=https://www.webmproject.org +endef + +define Package/libwebp/description + The libwebp package contains a library for the WebP format. +endef + +CMAKE_OPTIONS += \ + -DBUILD_SHARED_LIBS=ON \ + -DWEBP_BUILD_ANIM_UTILS=OFF \ + -DWEBP_BUILD_CWEBP=OFF \ + -DWEBP_BUILD_DWEBP=OFF \ + -DWEBP_BUILD_GIF2WEBP=OFF \ + -DWEBP_BUILD_IMG2WEBP=OFF \ + -DWEBP_BUILD_VWEBP=OFF \ + -DWEBP_BUILD_WEBPINFO=OFF \ + -DWEBP_BUILD_WEBPMUX=OFF \ + -DWEBP_BUILD_EXTRAS=OFF + +ifneq ($(findstring arm,$(CONFIG_ARCH)),) +ifeq ($(findstring neon,$(CONFIG_CPU_TYPE)),) +CMAKE_OPTIONS += -DWEBP_ENABLE_SIMD=OFF +endif +endif + +TARGET_CFLAGS += -flto + +define Package/libwebp/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libwebp.s* $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,libwebp)) diff --git a/libs/libwebp/patches/010-mips16.patch b/libs/libwebp/patches/010-mips16.patch new file mode 100644 index 00000000..3e69770a --- /dev/null +++ b/libs/libwebp/patches/010-mips16.patch @@ -0,0 +1,11 @@ +--- a/src/dsp/dsp.h ++++ b/src/dsp/dsp.h +@@ -95,7 +95,7 @@ extern "C" { + #define WEBP_USE_INTRINSICS + #endif + +-#if defined(__mips__) && !defined(__mips64) && \ ++#if defined(__mips__) && !defined(__mips16) && !defined(__mips64) && \ + defined(__mips_isa_rev) && (__mips_isa_rev >= 1) && (__mips_isa_rev < 6) + #define WEBP_USE_MIPS32 + #if (__mips_isa_rev >= 2) diff --git a/multimedia/gst1-libav/Makefile b/multimedia/gst1-libav/Makefile index 84890fb1..d6336b0c 100644 --- a/multimedia/gst1-libav/Makefile +++ b/multimedia/gst1-libav/Makefile @@ -8,15 +8,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gst1-libav -PKG_VERSION:=1.12.4 +PKG_VERSION:=1.16.2 PKG_RELEASE:=1 PKG_MAINTAINER:=W. Michael Petullo \ Ted Hess PKG_SOURCE:=gst-libav-$(PKG_VERSION).tar.xz -PKG_SOURCE_URL:=http://gstreamer.freedesktop.org/src/gst-libav -PKG_HASH:=2a56aa5d2d8cd912f2bce17f174713d2c417ca298f1f9c28ee66d4aa1e1d9e62 +PKG_SOURCE_URL:=https://gstreamer.freedesktop.org/src/gst-libav +PKG_HASH:=c724f612700c15a933c7356fbeabb0bb9571fb5538f8b1b54d4d2d94188deef2 PKG_LICENSE:=GPL-2.0 LGPL-2.0 PKG_LICENSE_FILES:=COPYING COPYING.LIB @@ -116,7 +116,7 @@ define Package/gst1-libav SECTION:=multimedia CATEGORY:=Multimedia TITLE:=GStreamer Libav plugin - URL:=http://www.gstreamer.net/modules/gst-libav.html + URL:=https://www.gstreamer.net/modules/gst-libav.html DEPENDS:= +libgstreamer1 +gstreamer1-plugins-base \ +gst1-mod-alsa +libgst1audio +libgst1pbutils +libgst1video \ +libbz2 +liblzma @@ -142,16 +142,36 @@ LIBAV_CONFIGURE_DEMUXERS:=$(call FILTER_CONFIG,DEMUXER,demuxer,$(LIBAV_DEMUXERS) LIBAV_CONFIGURE_PARSERS:=$(call FILTER_CONFIG,PARSER,parser,$(LIBAV_PARSERS)) LIBAV_CONFIGURE_PROTOCOLS:=$(call FILTER_CONFIG,PROTOCOL,protocol,$(LIBAV_PROTOCOLS)) -# Strip off FPU notation -REAL_CPU_TYPE:=$(firstword $(subst +, ,$(CONFIG_CPU_TYPE))) +# Hack to build on mips64. +ifneq ($(findstring octeonplus,$(CONFIG_CPU_TYPE)),) + REAL_CPU_TYPE:=octeon+ +else + # Strip off FPU notation. + REAL_CPU_TYPE:=$(firstword $(subst +, ,$(CONFIG_CPU_TYPE))) +endif CONFIGURE_ARGS += \ + --disable-Bsymbolic \ + --disable-fatal-warnings \ + --disable-glib-asserts \ + --disable-gobject-cast-checks \ + --disable-gtk-doc-html \ + --disable-valgrind \ --without-system-libav \ + --with-pic \ --with-libav-extra-configure=" \ $(if $(REAL_CPU_TYPE),--cpu=$(call qstrip,$(REAL_CPU_TYPE)),) \ --disable-bsfs \ --disable-programs \ --disable-devices \ + --disable-debug \ + --disable-doc \ + --disable-extra-warnings \ + --disable-htmlpages \ + --disable-manpages \ + --disable-podpages \ + --disable-txtpages \ + --disable-runtime-cpudetect \ --disable-encoders \ $(LIBAV_CONFIGURE_ENCODERS) \ --disable-decoders \ @@ -182,11 +202,7 @@ CONFIGURE_ARGS += \ --disable-fma4 \ --disable-avx2 \ --disable-inline-asm \ - --disable-yasm" - -TARGET_CFLAGS += -D_GNU_SOURCE - -TARGET_LDFLAGS += $(FPIC) + --disable-x86asm" define Package/gst1-libav/install $(INSTALL_DIR) $(1)/usr/lib/gstreamer-$(GST_VERSION) diff --git a/multimedia/gst1-plugins-bad/Makefile b/multimedia/gst1-plugins-bad/Makefile index 02486ee2..ea29e1ea 100644 --- a/multimedia/gst1-plugins-bad/Makefile +++ b/multimedia/gst1-plugins-bad/Makefile @@ -8,25 +8,24 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gst1-plugins-bad -PKG_VERSION:=1.12.4 +PKG_VERSION:=1.16.2 PKG_RELEASE:=1 -PKG_MAINTAINER:=W. Michael Petullo \ - Ted Hess - -PKG_LICENSE:=LGPLv2 GPLv2 -PKG_LICENSE_FILES:=COPYING.LIB COPYING - PKG_BUILD_DIR:=$(BUILD_DIR)/gst-plugins-bad-$(PKG_VERSION) PKG_SOURCE:=gst-plugins-bad-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://gstreamer.freedesktop.org/src/gst-plugins-bad/ -PKG_HASH:=0c7857be16686d5c1ba6e34bd338664d3d4599d32714a8eca5c8a41a101e2d08 +PKG_HASH:=f1cb7aa2389569a5343661aae473f0a940a90b872001824bc47fa8072a041e74 + +PKG_MAINTAINER:=W. Michael Petullo \ + Ted Hess +PKG_LICENSE:=LGPL-2.1-or-later GPL-2.0-or-later +PKG_LICENSE_FILES:=COPYING.LIB COPYING -PKG_FIXUP:=autoreconf PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk +include ../../devel/meson/meson.mk GST_BAD_LIBS:= GST_BAD_MODULES:= @@ -93,71 +92,168 @@ define Package/gstreamer1-plugins-bad/config endef +GST_COND_SELECT = -D$(1)=$(if $(CONFIG_PACKAGE_gst1-mod-$(1)),en,dis)abled + GST_VERSION:=1.0 -CONFIGURE_ARGS += \ - --disable-debug \ - --disable-examples \ - --disable-nls \ +MESON_ARGS += \ + $(call GST_COND_SELECT,adpcmdec) \ + $(call GST_COND_SELECT,adpcmenc) \ + $(call GST_COND_SELECT,aiff) \ + $(call GST_COND_SELECT,asfmux) \ + $(call GST_COND_SELECT,audiobuffersplit) \ + $(call GST_COND_SELECT,audiofxbad) \ + $(call GST_COND_SELECT,audiolatency) \ + $(call GST_COND_SELECT,audiomixmatrix) \ + $(call GST_COND_SELECT,audiovisualizers) \ + $(call GST_COND_SELECT,autoconvert) \ + $(call GST_COND_SELECT,bayer) \ + -Dcamerabin2=$(if $(CONFIG_PACKAGE_gst1-mod-camerabin),en,dis)abled \ + $(call GST_COND_SELECT,coloreffects) \ + -Ddebugutils=$(if $(CONFIG_PACKAGE_gst1-mod-debugutilsbad),en,dis)abled \ + $(call GST_COND_SELECT,dvbsuboverlay) \ + $(call GST_COND_SELECT,dvdspu) \ + $(call GST_COND_SELECT,faceoverlay) \ + $(call GST_COND_SELECT,festival) \ + $(call GST_COND_SELECT,fieldanalysis) \ + $(call GST_COND_SELECT,freeverb) \ + $(call GST_COND_SELECT,frei0r) \ + $(call GST_COND_SELECT,gaudieffects) \ + $(call GST_COND_SELECT,gdp) \ + $(call GST_COND_SELECT,geometrictransform) \ + $(call GST_COND_SELECT,id3tag) \ + $(call GST_COND_SELECT,inter) \ + $(call GST_COND_SELECT,interlace) \ + $(call GST_COND_SELECT,ivfparse) \ + $(call GST_COND_SELECT,ivtc) \ + $(call GST_COND_SELECT,jp2kdecimator) \ + $(call GST_COND_SELECT,jpegformat) \ + -Dlibrfb=$(if $(CONFIG_PACKAGE_gst1-mod-rfbsrc),en,dis)abled \ + $(call GST_COND_SELECT,midi) \ + -Dmpegdemux=$(if $(CONFIG_PACKAGE_gst1-mod-mpegpsdemux),en,dis)abled \ + $(call GST_COND_SELECT,mpegpsmux) \ + $(call GST_COND_SELECT,mpegtsdemux) \ + $(call GST_COND_SELECT,mpegtsmux) \ + $(call GST_COND_SELECT,mxf) \ + $(call GST_COND_SELECT,netsim) \ + -Donvif=$(if $(CONFIG_PACKAGE_gst1-mod-rtponvif),en,dis)abled \ + $(call GST_COND_SELECT,pcapparse) \ + $(call GST_COND_SELECT,pnm) \ + $(call GST_COND_SELECT,proxy) \ + -Drawparse=$(if $(CONFIG_PACKAGE_gst1-mod-legacyrawparse),en,dis)abled \ + $(call GST_COND_SELECT,removesilence) \ + -Dsdp=$(if $(CONFIG_PACKAGE_gst1-mod-sdpelem),en,dis)abled \ + $(call GST_COND_SELECT,segmentclip) \ + $(call GST_COND_SELECT,siren) \ + $(call GST_COND_SELECT,smooth) \ + $(call GST_COND_SELECT,speed) \ + $(call GST_COND_SELECT,subenc) \ + $(call GST_COND_SELECT,timecode) \ + -Dvideofilters=$(if $(CONFIG_PACKAGE_gst1-mod-videofiltersbad),en,dis)abled \ + $(call GST_COND_SELECT,videoframe_audiolevel) \ + -Dvideoparsers=$(if $(CONFIG_PACKAGE_gst1-mod-videoparsersbad),en,dis)abled \ + $(call GST_COND_SELECT,videosignal) \ + $(call GST_COND_SELECT,vmnc) \ + -Dy4m=$(if $(CONFIG_PACKAGE_gst1-mod-y4mdec),en,dis)abled \ + $(call GST_COND_SELECT,yadif) \ \ - --disable-directsound \ - --disable-directdraw \ - --disable-osx_video \ - --disable-quicktime \ - --disable-vcd \ - --disable-assrender \ - --disable-apexsink \ - --disable-bz2 \ - --disable-dc1394 \ - --disable-directfb \ - --disable-dts \ - --disable-resindvd \ - --disable-faac \ - --disable-faad \ - --disable-flite \ - --disable-gsm \ - --disable-kate \ - --disable-ladspa \ - --disable-lv2 \ - --disable-modplug \ - --disable-mimic \ - --disable-libmms \ - --disable-mpeg2enc \ - --disable-mplex \ - --disable-musepack \ - --disable-mythtv \ - --disable-nas \ - --disable-neon \ - --disable-ofa \ - --disable-rsvg \ - --disable-timidity \ - --disable-wildmidi \ - --disable-sdl \ - --disable-sdltest \ - --disable-sndfile \ - --disable-soundtouch \ - --disable-spc \ - --disable-gme \ - --disable-xvid \ - --disable-dvb \ - --disable-wininet \ - --disable-acm \ - --disable-vdpau \ - --disable-schro \ - --disable-zbar \ - --disable-srtp \ + -Dopencv=disabled \ + -Dwayland=disabled \ + -Dx11=disabled \ \ - --without-libiconv-prefix \ - --without-libintl-prefix \ - --with-libgcrypt-prefix="$(STAGING_DIR)/usr" \ - --without-x \ - -TARGET_CFLAGS+= -std=gnu99 - -EXTRA_LDFLAGS+= \ - -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ - $(if $(ICONV_FULL),-liconv) \ - + -Daom=disabled \ + -Dandroidmedia=disabled \ + -Dapplemedia=disabled \ + -Dassrender=disabled \ + $(call GST_COND_SELECT,bluez) \ + -Dbs2b=disabled \ + $(call GST_COND_SELECT,bz2) \ + -Dchromaprint=disabled \ + -Dclosedcaption=disabled \ + -Dcolormanagement=disabled \ + -Dcurl=disabled \ + -Dcurl-ssh2=disabled \ + -Dd3dvideosink=disabled \ + -Ddash=disabled \ + -Ddc1394=disabled \ + -Ddecklink=disabled \ + -Ddirectfb=disabled \ + -Ddirectsound=disabled \ + $(call GST_COND_SELECT,dtls) \ + -Ddts=disabled \ + -Ddvb=disabled \ + -Dfaac=disabled \ + $(call GST_COND_SELECT,faad) \ + -Dfbdev=$(if $(CONFIG_PACKAGE_gst1-mod-fbdevsink),en,dis)abled \ + -Dfdkaac=disabled \ + -Dflite=disabled \ + -Dfluidsynth=disabled \ + -Dgl=disabled \ + -Dgme=disabled \ + -Dgsm=disabled \ + -Dipcpipeline=disabled \ + -Diqa=disabled \ + -Dkate=disabled \ + -Dladspa=disabled \ + -Dlibde265=disabled \ + -Dlibmms=disabled \ + -Dlv2=disabled \ + -Dmodplug=disabled \ + -Dmpeg2enc=disabled \ + -Dmplex=disabled \ + -Dmsdk=disabled \ + -Dmusepack=disabled \ + -Dneon=disabled \ + -Dnvdec=disabled \ + -Dnvenc=disabled \ + -Dofa=disabled \ + -Dopenal=disabled \ + -Dopenexr=disabled \ + -Dopenh264=disabled \ + -Dopenjpeg=disabled \ + -Dopenmpt=disabled \ + -Dopenni2=disabled \ + -Dopensles=disabled \ + -Dopus=$(if $(CONFIG_PACKAGE_gst1-mod-opusparse),en,dis)abled \ + -Dresindvd=disabled \ + -Drsvg=disabled \ + -Drtmp=disabled \ + $(call GST_COND_SELECT,sbc) \ + -Dsctp=disabled \ + -Dsmoothstreaming=disabled \ + $(call GST_COND_SELECT,sndfile) \ + -Dsoundtouch=disabled \ + -Dspandsp=disabled \ + -Dsrt=disabled \ + -Dsrtp=disabled \ + -Dteletext=disabled \ + -Dtinyalsa=disabled \ + -Dttml=disabled \ + -Duvch264=disabled \ + -Dvdpau=disabled \ + -Dvoaacenc=disabled \ + -Dvoamrwbenc=disabled \ + -Dvulkan=disabled \ + -Dwasapi=disabled \ + $(call GST_COND_SELECT,webp) \ + -Dwebrtc=disabled \ + -Dwebrtcdsp=disabled \ + -Dwildmidi=disabled \ + -Dwinks=disabled \ + -Dwinscreencap=disabled \ + -Dx265=disabled \ + -Dzbar=disabled \ + -Dwpe=disabled \ + \ + $(call GST_COND_SELECT,hls) \ + -Dhls-crypto=nettle \ + -Dexamples=disabled \ + -Dtests=disabled \ + -Dintrospection=disabled \ + -Dorc=disabled \ + -Dgobject-cast-checks=disabled \ + -Dglib-asserts=disabled \ + -Dglib-checks=disabled define Package/gst1-plugins-bad/install /bin/true @@ -200,7 +296,6 @@ $(eval $(call GstBuildLibrary,adaptivedemux,adaptivedemux,app uridownloader,)) $(eval $(call GstBuildLibrary,photography,photography,,)) $(eval $(call GstBuildLibrary,basecamerabinsrc,basecamerabinsrc,app,)) $(eval $(call GstBuildLibrary,uridownloader,uridownloader,,)) -$(eval $(call GstBuildLibrary,badbase,badbase,,)) # 1: short name # 2: description @@ -241,35 +336,74 @@ $(eval $(call GstBuildPlugin,adpcmdec,adpcm decoding support,audio,,)) $(eval $(call GstBuildPlugin,adpcmenc,adpcm encoding support,audio,,)) $(eval $(call GstBuildPlugin,aiff,aiff support,audio tag,,)) $(eval $(call GstBuildPlugin,asfmux,asf muxing support,rtp,,)) +$(eval $(call GstBuildPlugin,audiobuffersplit,audiobuffersplit support,audio,,)) +$(eval $(call GstBuildPlugin,audiofxbad,audiofxbad support,audio,,)) +$(eval $(call GstBuildPlugin,audiolatency,audiolatency support,audio,,)) +$(eval $(call GstBuildPlugin,audiomixmatrix,audiomixmatrix support,audio,,)) +$(eval $(call GstBuildPlugin,audiovisualizers,audiovisualizers support,audio,,)) $(eval $(call GstBuildPlugin,autoconvert,autoconvert support,,,)) $(eval $(call GstBuildPlugin,bayer,bayer support,video,,)) +$(eval $(call GstBuildPlugin,bluez,bluez support,,,+bluez-libs)) +$(eval $(call GstBuildPlugin,bz2,bzip2 support,,,+libbz2)) $(eval $(call GstBuildPlugin,camerabin,camerabin support,basecamerabinsrc photography pbutils app,,)) +$(eval $(call GstBuildPlugin,coloreffects,coloreffects support,video,,)) #$(eval $(call GstBuildPlugin,dataurisrc,dataurisrc support,,,)) $(eval $(call GstBuildPlugin,debugutilsbad,debugutils support,video,,)) +$(eval $(call GstBuildPlugin,dtls,DTLS support,,,+libopenssl)) +$(eval $(call GstBuildPlugin,dvbsuboverlay,dvbsuboverlay support,video,,)) $(eval $(call GstBuildPlugin,dvdspu,dvdspu support,video,,)) +$(eval $(call GstBuildPlugin,faad,faad support,audio,,+libfaad2)) +$(eval $(call GstBuildPlugin,faceoverlay,faceoverlay support,pbutils,,)) $(eval $(call GstBuildPlugin,fbdevsink,fbdev support,video,,)) $(eval $(call GstBuildPlugin,festival,festival support,audio,,)) -$(eval $(call GstBuildPlugin,hls,HLS support,pbutils adaptivedemux,multifile,+libnettle)) +$(eval $(call GstBuildPlugin,fieldanalysis,fieldanalysis support,audio,,)) +$(eval $(call GstBuildPlugin,freeverb,freeverb support,,,)) $(eval $(call GstBuildPlugin,frei0r,frei0r support,controller video,,)) +$(eval $(call GstBuildPlugin,gaudieffects,gaudieffects support,audio,,)) +$(eval $(call GstBuildPlugin,gdp,gdp support,,,)) +$(eval $(call GstBuildPlugin,geometrictransform,geometrictransform support,,,)) +$(eval $(call GstBuildPlugin,hls,HLS support,pbutils adaptivedemux,multifile,+libnettle)) $(eval $(call GstBuildPlugin,id3tag,id3tag support,tag,,)) +$(eval $(call GstBuildPlugin,inter,inter support,,,)) +$(eval $(call GstBuildPlugin,interlace,interlace support,,,)) +$(eval $(call GstBuildPlugin,ivfparse,ivfparse support,,,)) +$(eval $(call GstBuildPlugin,ivtc,ivtc support,,,)) +$(eval $(call GstBuildPlugin,jp2kdecimator,jp2kdecimator support,,,)) $(eval $(call GstBuildPlugin,jpegformat,jpegformat support,tag,,)) +$(eval $(call GstBuildPlugin,legacyrawparse,rawparse support,audio video,,)) +$(eval $(call GstBuildPlugin,midi,midi support,audio,,)) $(eval $(call GstBuildPlugin,mpegpsdemux,mpegpsdemux support,pbutils,,)) $(eval $(call GstBuildPlugin,mpegpsmux,mpegpsmux support,,,)) #$(eval $(call GstBuildPlugin,mpegtsdemux,mpegtsdemux support,mpegts pbutils,,)) #$(eval $(call GstBuildPlugin,mpegtsmux,mpegtsmux support,video,,)) -$(eval $(call GstBuildPlugin,mxf,mxf support,badbase audio video,,)) +$(eval $(call GstBuildPlugin,mxf,mxf support,audio video,,)) +$(eval $(call GstBuildPlugin,netsim,netsim support,,,)) $(eval $(call GstBuildPlugin,opusparse,OPUS streams library,pbutils,,+libopus)) $(eval $(call GstBuildPlugin,pcapparse,pcapparse support,,,)) $(eval $(call GstBuildPlugin,pnm,pnm support,video,,)) -#$(eval $(call GstBuildPlugin,rawparse,rawparse support,audio video,,)) +$(eval $(call GstBuildPlugin,proxy,proxy support,,,)) +$(eval $(call GstBuildPlugin,removesilence,removesilence support,audio,,)) $(eval $(call GstBuildPlugin,rfbsrc,librfb support,video,,)) +$(eval $(call GstBuildPlugin,rtponvif,rtponvif support,,,)) +$(eval $(call GstBuildPlugin,sbc,sbc support,audio,,+sbc)) $(eval $(call GstBuildPlugin,sdpelem,sdp support,rtp sdp,,)) $(eval $(call GstBuildPlugin,segmentclip,segmentclip support,audio,,)) $(eval $(call GstBuildPlugin,shm,POSIX shared memory source and sink,,,+librt)) $(eval $(call GstBuildPlugin,siren,siren support,audio rtp,,)) +$(eval $(call GstBuildPlugin,smooth,smooth support,,,)) +$(eval $(call GstBuildPlugin,sndfile,sndfile support,audio,,+libsndfile)) $(eval $(call GstBuildPlugin,speed,speed support,audio,,)) $(eval $(call GstBuildPlugin,subenc,subenc support,controller,,)) #$(eval $(call GstBuildPlugin,srtp,srtp support,rtp,,+libsrtp)) +$(eval $(call GstBuildPlugin,timecode,timecode support,,,)) +$(eval $(call GstBuildPlugin,videofiltersbad,videofiltersbad support,,,)) +$(eval $(call GstBuildPlugin,videoframe_audiolevel,videoframe_audiolevel support,,,)) +#$(eval $(call GstBuildPlugin,videoparsersbad,videoparsersbad support,,,)) +$(eval $(call GstBuildPlugin,videosignal,videosignal support,,,)) +$(eval $(call GstBuildPlugin,vmnc,vmnc support,,,)) +$(eval $(call GstBuildPlugin,webp,webp support,,,+libwebp)) +$(eval $(call GstBuildPlugin,y4mdec,y4mdec support,,,)) +$(eval $(call GstBuildPlugin,yadif,yadif support,,,)) $(eval $(call BuildPackage,gstreamer1-plugins-bad)) $(eval $(call BuildPackage,gst1-plugins-bad)) diff --git a/multimedia/gst1-plugins-bad/patches/001-no-translations.patch b/multimedia/gst1-plugins-bad/patches/001-no-translations.patch deleted file mode 100644 index 67371c5d..00000000 --- a/multimedia/gst1-plugins-bad/patches/001-no-translations.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -u --recursive gst-plugins-bad-1.12.4-vanilla/configure.ac gst-plugins-bad-1.12.4/configure.ac ---- gst-plugins-bad-1.12.4-vanilla/configure.ac 2018-02-11 19:43:06.962320214 -0500 -+++ gst-plugins-bad-1.12.4/configure.ac 2018-02-11 19:43:48.643416395 -0500 -@@ -3717,7 +3717,6 @@ - ext/dtls/Makefile - ext/webrtcdsp/Makefile - ext/ttml/Makefile --po/Makefile.in - docs/Makefile - docs/plugins/Makefile - docs/libs/Makefile -diff -u --recursive gst-plugins-bad-1.12.4-vanilla/Makefile.am gst-plugins-bad-1.12.4/Makefile.am ---- gst-plugins-bad-1.12.4-vanilla/Makefile.am 2018-02-11 19:43:06.987320271 -0500 -+++ gst-plugins-bad-1.12.4/Makefile.am 2018-02-11 19:43:55.023431118 -0500 -@@ -2,11 +2,11 @@ - - SUBDIRS = \ - gst-libs gst sys ext pkgconfig \ -- m4 common docs tests po tools -+ m4 common docs tests tools - - DIST_SUBDIRS = \ - gst gst-libs sys ext pkgconfig \ -- m4 common docs tests po tools -+ m4 common docs tests tools - - # include before EXTRA_DIST for win32 assignment - include $(top_srcdir)/common/win32.mak diff --git a/multimedia/gst1-plugins-bad/patches/002-no-tests.patch b/multimedia/gst1-plugins-bad/patches/002-no-tests.patch deleted file mode 100644 index fe38b269..00000000 --- a/multimedia/gst1-plugins-bad/patches/002-no-tests.patch +++ /dev/null @@ -1,59 +0,0 @@ -diff -u --recursive gst-plugins-bad-1.12.4-vanilla/configure.ac gst-plugins-bad-1.12.4/configure.ac ---- gst-plugins-bad-1.12.4-vanilla/configure.ac 2018-02-11 19:46:16.942758605 -0500 -+++ gst-plugins-bad-1.12.4/configure.ac 2018-02-11 19:46:38.356808019 -0500 -@@ -3619,38 +3619,6 @@ - sys/wasapi/Makefile - sys/winks/Makefile - sys/winscreencap/Makefile --tests/Makefile --tests/check/Makefile --tests/files/Makefile --tests/examples/Makefile --tests/examples/avsamplesink/Makefile --tests/examples/camerabin2/Makefile --tests/examples/codecparsers/Makefile --tests/examples/directfb/Makefile --tests/examples/audiomixmatrix/Makefile --tests/examples/gl/Makefile --tests/examples/gl/cocoa/Makefile --tests/examples/gl/clutter/Makefile --tests/examples/gl/generic/Makefile --tests/examples/gl/generic/cube/Makefile --tests/examples/gl/generic/cubeyuv/Makefile --tests/examples/gl/generic/doublecube/Makefile --tests/examples/gl/generic/recordgraphic/Makefile --tests/examples/gl/gtk/Makefile --tests/examples/gl/gtk/3dvideo/Makefile --tests/examples/gl/gtk/filternovideooverlay/Makefile --tests/examples/gl/gtk/filtervideooverlay/Makefile --tests/examples/gl/gtk/fxtest/Makefile --tests/examples/gl/gtk/switchvideooverlay/Makefile --tests/examples/gl/qt/Makefile --tests/examples/gl/sdl/Makefile --tests/examples/gtk/Makefile --tests/examples/mpegts/Makefile --tests/examples/mxf/Makefile --tests/examples/opencv/Makefile --tests/examples/uvch264/Makefile --tests/examples/waylandsink/Makefile --tests/icles/Makefile - ext/voamrwbenc/Makefile - ext/voaacenc/Makefile - ext/assrender/Makefile -diff -u --recursive gst-plugins-bad-1.12.4-vanilla/Makefile.am gst-plugins-bad-1.12.4/Makefile.am ---- gst-plugins-bad-1.12.4-vanilla/Makefile.am 2018-02-11 19:46:16.980758692 -0500 -+++ gst-plugins-bad-1.12.4/Makefile.am 2018-02-11 19:46:49.443833603 -0500 -@@ -2,11 +2,11 @@ - - SUBDIRS = \ - gst-libs gst sys ext pkgconfig \ -- m4 common docs tests tools -+ m4 common docs tools - - DIST_SUBDIRS = \ - gst gst-libs sys ext pkgconfig \ -- m4 common docs tests tools -+ m4 common docs tools - - # include before EXTRA_DIST for win32 assignment - include $(top_srcdir)/common/win32.mak diff --git a/multimedia/gst1-plugins-base/Makefile b/multimedia/gst1-plugins-base/Makefile index ee5e0c86..b6d8a30a 100644 --- a/multimedia/gst1-plugins-base/Makefile +++ b/multimedia/gst1-plugins-base/Makefile @@ -8,19 +8,25 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gst1-plugins-base -PKG_VERSION:=1.12.4 +PKG_VERSION:=1.16.2 PKG_RELEASE:=1 +PKG_SOURCE:=gst-plugins-base-$(PKG_VERSION).tar.xz +PKG_SOURCE_URL:=https://gstreamer.freedesktop.org/src/gst-plugins-base +PKG_HASH:=b13e73e2fe74a4166552f9577c3dcb24bed077021b9c7fa600d910ec6987816a +PKG_BUILD_DIR:=$(BUILD_DIR)/gst-plugins-base-$(PKG_VERSION) + PKG_MAINTAINER:=W. Michael Petullo \ Ted Hess - -PKG_LICENSE:=LGPLv2 GPLv2 +PKG_LICENSE:=LGPL-2.1-or-later GPL-2.0-or-later PKG_LICENSE_FILES:=COPYING.LIB COPYING +PKG_CPE_ID:=cpe:/a:gstreamer:gst-plugins-base -PKG_BUILD_DIR:=$(BUILD_DIR)/gst-plugins-base-$(PKG_VERSION) -PKG_SOURCE:=gst-plugins-base-$(PKG_VERSION).tar.xz -PKG_SOURCE_URL:=http://gstreamer.freedesktop.org/src/gst-plugins-base/ -PKG_HASH:=4c306b03df0212f1b8903784e29bb3493319ba19ebebf13b0c56a17870292282 +PKG_INSTALL:=1 + +include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/nls.mk +include ../../devel/meson/meson.mk PKG_CONFIG_DEPENDS:= \ CONFIG_PACKAGE_gst1-mod-alsa \ @@ -29,21 +35,20 @@ PKG_CONFIG_DEPENDS:= \ CONFIG_PACKAGE_gst1-mod-audiorate \ CONFIG_PACKAGE_gst1-mod-audioresample \ CONFIG_PACKAGE_gst1-mod-audiotestsrc \ + CONFIG_PACKAGE_gst1-mod-playback \ CONFIG_PACKAGE_gst1-mod-gio \ CONFIG_PACKAGE_gst1-mod-ogg \ + CONFIG_PACKAGE_gst1-mod-opus \ CONFIG_PACKAGE_gst1-mod-tcp \ CONFIG_PACKAGE_gst1-mod-theora \ + CONFIG_PACKAGE_gst1-mod-typefind \ CONFIG_PACKAGE_gst1-mod-videoconvert \ + CONFIG_PACKAGE_gst1-mod-videorate \ + CONFIG_PACKAGE_gst1-mod-videoscale \ CONFIG_PACKAGE_gst1-mod-videotestsrc \ CONFIG_PACKAGE_gst1-mod-volume \ CONFIG_PACKAGE_gst1-mod-vorbis \ - CONFIG_PACKAGE_libgst1app \ - -PKG_FIXUP:=autoreconf -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/nls.mk + CONFIG_PACKAGE_libgst1app GST_BASE_LIBS:= GST_BASE_MODULES:= @@ -52,7 +57,7 @@ define Package/gstreamer1-base/Default CATEGORY:=Multimedia SECTION:=multimedia TITLE:=GStreamer - URL:=http://gstreamer.freedesktop.org/ + URL:=https://gstreamer.freedesktop.org/ DEPENDS:= +libgstreamer1 $(ICONV_DEPENDS) endef @@ -110,48 +115,58 @@ define Package/gstreamer1-plugins-base/config endef -GST_COND_SELECT = $(patsubst %,$(if $(CONFIG_PACKAGE_gst1-mod-$(1)),--enable,--disable)-%,$(1)) +GST_COND_SELECT = -D$(1)=$(if $(CONFIG_PACKAGE_gst1-mod-$(1)),en,dis)abled GST_VERSION:=1.0 -CONFIGURE_ARGS += \ - --disable-debug \ - --disable-examples \ +MESON_ARGS += \ + -Daudioresample_format=int \ + -Dgl=disabled \ \ - $(call GST_COND_SELECT,alsa) \ + $(call GST_COND_SELECT,adder) \ $(call GST_COND_SELECT,app) \ $(call GST_COND_SELECT,audioconvert) \ + $(call GST_COND_SELECT,audiomixer) \ $(call GST_COND_SELECT,audiorate) \ $(call GST_COND_SELECT,audioresample) \ $(call GST_COND_SELECT,audiotestsrc) \ - --disable-cdparanoia \ - --disable-freetypetest \ + $(call GST_COND_SELECT,compositor) \ + $(call GST_COND_SELECT,encoding) \ $(call GST_COND_SELECT,gio) \ - --disable-libvisual \ - $(call GST_COND_SELECT,ogg) \ - --disable-pango \ - --disable-subparse \ + $(call GST_COND_SELECT,overlaycomposition) \ + $(call GST_COND_SELECT,pbtypes) \ + $(call GST_COND_SELECT,playback) \ + $(call GST_COND_SELECT,rawparse) \ + $(call GST_COND_SELECT,subparse) \ $(call GST_COND_SELECT,tcp) \ - $(call GST_COND_SELECT,theora) \ + -Dtypefind=$(if $(CONFIG_PACKAGE_gst1-mod-typefindfunctions),en,dis)abled \ + $(call GST_COND_SELECT,videoconvert) \ $(call GST_COND_SELECT,videorate) \ $(call GST_COND_SELECT,videoscale) \ - $(call GST_COND_SELECT,videoconvert) \ $(call GST_COND_SELECT,videotestsrc) \ $(call GST_COND_SELECT,volume) \ + \ + $(call GST_COND_SELECT,alsa) \ + $(call GST_COND_SELECT,cdparanoia) \ + $(call GST_COND_SELECT,ogg) \ + $(call GST_COND_SELECT,opus) \ + $(call GST_COND_SELECT,pango) \ + $(call GST_COND_SELECT,theora) \ $(call GST_COND_SELECT,vorbis) \ - --disable-x \ - --disable-xshm \ - --disable-xvideo \ + -Dx11=disabled \ + -Dxshm=disabled \ + -Dxvideo=disabled \ \ - --without-libiconv-prefix \ - --without-libintl-prefix \ - --without-x \ - \ - --with-audioresample-format=int \ - -EXTRA_LDFLAGS+= \ - -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ - $(if $(ICONV_FULL),-liconv) \ + -Dexamples=disabled \ + -Dtests=disabled \ + -Dtools=disabled \ + -Dgtk_doc=disabled \ + -Dintrospection=disabled \ + -Dnls=enabled \ + -Dorc=disabled \ + -Dgobject-cast-checks=disabled \ + -Dglib-asserts=disabled \ + -Dglib-checks=disabled define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include/gstreamer-$(GST_VERSION) @@ -161,12 +176,12 @@ define Build/InstallDev ) $(INSTALL_DIR) $(1)/usr/lib ( cd $(PKG_INSTALL_DIR); $(CP) \ - ./usr/lib/libgst*-$(GST_VERSION).{la,so*} \ + ./usr/lib/libgst*-$(GST_VERSION).so* \ $(1)/usr/lib/ \ ) $(INSTALL_DIR) $(1)/usr/lib/gstreamer-$(GST_VERSION) ( cd $(PKG_INSTALL_DIR); $(CP) \ - ./usr/lib/gstreamer-$(GST_VERSION)/libgst*.{la,so} \ + ./usr/lib/gstreamer-$(GST_VERSION)/libgst*.so \ $(1)/usr/lib/gstreamer-$(GST_VERSION)/ \ ) $(INSTALL_DIR) $(1)/usr/lib/pkgconfig diff --git a/multimedia/gst1-plugins-base/patches/001-no-translations.patch b/multimedia/gst1-plugins-base/patches/001-no-translations.patch deleted file mode 100644 index 99e64d61..00000000 --- a/multimedia/gst1-plugins-base/patches/001-no-translations.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -u --recursive gst-plugins-base-1.12.4-vanilla/configure.ac gst-plugins-base-1.12.4/configure.ac ---- gst-plugins-base-1.12.4-vanilla/configure.ac 2018-02-11 09:52:04.704954684 -0500 -+++ gst-plugins-base-1.12.4/configure.ac 2018-02-11 09:53:01.444071594 -0500 -@@ -964,7 +964,6 @@ - docs/libs/Makefile - docs/plugins/Makefile - docs/version.entities --po/Makefile.in - common/Makefile - common/m4/Makefile - m4/Makefile -diff -u --recursive gst-plugins-base-1.12.4-vanilla/Makefile.am gst-plugins-base-1.12.4/Makefile.am ---- gst-plugins-base-1.12.4-vanilla/Makefile.am 2018-02-11 09:52:04.704954684 -0500 -+++ gst-plugins-base-1.12.4/Makefile.am 2018-02-11 09:53:08.156085423 -0500 -@@ -13,7 +13,6 @@ - tools \ - tests \ - docs \ -- po \ - common \ - m4 - -@@ -24,7 +23,6 @@ - gst sys ext \ - tools \ - tests \ -- po \ - common \ - m4 - diff --git a/multimedia/gst1-plugins-base/patches/002-no-tests.patch b/multimedia/gst1-plugins-base/patches/002-no-tests.patch deleted file mode 100644 index 926cec03..00000000 --- a/multimedia/gst1-plugins-base/patches/002-no-tests.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -u --recursive gst-plugins-base-1.12.4-vanilla/configure.ac gst-plugins-base-1.12.4/configure.ac ---- gst-plugins-base-1.12.4-vanilla/configure.ac 2018-02-11 09:54:25.065243893 -0500 -+++ gst-plugins-base-1.12.4/configure.ac 2018-02-11 09:55:12.112340832 -0500 -@@ -942,24 +942,6 @@ - pkgconfig/gstreamer-video-uninstalled.pc - pkgconfig/gstreamer-plugins-base.pc - pkgconfig/gstreamer-plugins-base-uninstalled.pc --tests/Makefile --tests/check/Makefile --tests/examples/Makefile --tests/examples/app/Makefile --tests/examples/audio/Makefile --tests/examples/decodebin_next/Makefile --tests/examples/dynamic/Makefile --tests/examples/encoding/Makefile --tests/examples/fft/Makefile --tests/examples/gio/Makefile --tests/examples/overlay/Makefile --tests/examples/seek/Makefile --tests/examples/snapshot/Makefile --tests/examples/playback/Makefile --tests/examples/playrec/Makefile --tests/files/Makefile --tests/icles/Makefile --tests/icles/playback/Makefile - docs/Makefile - docs/libs/Makefile - docs/plugins/Makefile -diff -u --recursive gst-plugins-base-1.12.4-vanilla/Makefile.am gst-plugins-base-1.12.4/Makefile.am ---- gst-plugins-base-1.12.4-vanilla/Makefile.am 2018-02-11 09:54:25.091243946 -0500 -+++ gst-plugins-base-1.12.4/Makefile.am 2018-02-11 09:55:19.994357073 -0500 -@@ -11,7 +11,6 @@ - gst-libs \ - gst sys $(SUBDIRS_EXT) \ - tools \ -- tests \ - docs \ - common \ - m4 -@@ -22,7 +21,6 @@ - gst-libs \ - gst sys ext \ - tools \ -- tests \ - common \ - m4 - diff --git a/multimedia/gst1-plugins-base/patches/003-no-docs.patch b/multimedia/gst1-plugins-base/patches/003-no-docs.patch deleted file mode 100644 index 2390ca98..00000000 --- a/multimedia/gst1-plugins-base/patches/003-no-docs.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -u --recursive gst-plugins-base-1.12.4-vanilla/configure.ac gst-plugins-base-1.12.4/configure.ac ---- gst-plugins-base-1.12.4-vanilla/configure.ac 2018-02-11 09:55:52.832424735 -0500 -+++ gst-plugins-base-1.12.4/configure.ac 2018-02-11 09:56:25.417491876 -0500 -@@ -942,10 +942,6 @@ - pkgconfig/gstreamer-video-uninstalled.pc - pkgconfig/gstreamer-plugins-base.pc - pkgconfig/gstreamer-plugins-base-uninstalled.pc --docs/Makefile --docs/libs/Makefile --docs/plugins/Makefile --docs/version.entities - common/Makefile - common/m4/Makefile - m4/Makefile -diff -u --recursive gst-plugins-base-1.12.4-vanilla/Makefile.am gst-plugins-base-1.12.4/Makefile.am ---- gst-plugins-base-1.12.4-vanilla/Makefile.am 2018-02-11 09:55:52.832424735 -0500 -+++ gst-plugins-base-1.12.4/Makefile.am 2018-02-11 09:56:32.742506969 -0500 -@@ -11,13 +11,11 @@ - gst-libs \ - gst sys $(SUBDIRS_EXT) \ - tools \ -- docs \ - common \ - m4 - - DIST_SUBDIRS = \ - pkgconfig \ -- docs \ - gst-libs \ - gst sys ext \ - tools \ diff --git a/multimedia/gst1-plugins-good/Makefile b/multimedia/gst1-plugins-good/Makefile index 315b56a7..dc229c26 100644 --- a/multimedia/gst1-plugins-good/Makefile +++ b/multimedia/gst1-plugins-good/Makefile @@ -8,25 +8,29 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gst1-plugins-good -PKG_VERSION:=1.12.4 +PKG_VERSION:=1.16.2 PKG_RELEASE:=1 +PKG_SOURCE:=gst-plugins-good-$(PKG_VERSION).tar.xz +PKG_SOURCE_URL:=https://gstreamer.freedesktop.org/src/gst-plugins-good/ +PKG_HASH:=40bb3bafda25c0b739c8fc36e48380fccf61c4d3f83747e97ac3f9b0171b1319 +PKG_BUILD_DIR:=$(BUILD_DIR)/gst-plugins-good-$(PKG_VERSION) + PKG_MAINTAINER:=W. Michael Petullo \ Ted Hess - -PKG_LICENSE:=LGPLv2 +PKG_LICENSE:=LGPL-2.1-or-later PKG_LICENSE_FILES:=COPYING +PKG_CPE_ID:=cpe:/a:gstreamer:good_plug-ins -PKG_BUILD_DIR:=$(BUILD_DIR)/gst-plugins-good-$(PKG_VERSION) -PKG_SOURCE:=gst-plugins-good-$(PKG_VERSION).tar.xz -PKG_SOURCE_URL:=http://gstreamer.freedesktop.org/src/gst-plugins-good/ -PKG_HASH:=649f49bec60892d47ee6731b92266974c723554da1c6649f21296097715eb957 - -PKG_FIXUP:=autoreconf PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk +include ../../devel/meson/meson.mk + +PKG_CONFIG_DEPENDS:= \ + CONFIG_PACKAGE_gst1-mod-lame \ + CONFIG_PACKAGE_gst1-mod-mpg123 GST_GOOD_MODULES:= @@ -34,7 +38,7 @@ define Package/gstreamer1-good/Default CATEGORY:=Multimedia SECTION:=multimedia TITLE:=GStreamer - URL:=http://gstreamer.freedesktop.org/ + URL:=https://gstreamer.freedesktop.org/ DEPENDS:= +libgstreamer1 +libgst1pbutils $(ICONV_DEPENDS) endef @@ -85,47 +89,93 @@ define Package/gstreamer1-plugins-good/config endef +GST_COND_SELECT = -D$(1)=$(if $(CONFIG_PACKAGE_gst1-mod-$(1)),en,dis)abled + GST_VERSION:=1.0 -CONFIGURE_ARGS += \ - --disable-debug \ - --disable-examples \ +MESON_ARGS += \ + $(call GST_COND_SELECT,alpha) \ + $(call GST_COND_SELECT,apetag) \ + $(call GST_COND_SELECT,audiofx) \ + $(call GST_COND_SELECT,audioparsers) \ + $(call GST_COND_SELECT,auparse) \ + $(call GST_COND_SELECT,autodetect) \ + $(call GST_COND_SELECT,avi) \ + $(call GST_COND_SELECT,cutter) \ + -Ddebugutils=$(if $(CONFIG_PACKAGE_gst1-mod-debug),en,dis)abled \ + $(call GST_COND_SELECT,deinterlace) \ + $(call GST_COND_SELECT,dtmf) \ + $(call GST_COND_SELECT,effectv) \ + $(call GST_COND_SELECT,equalizer) \ + $(call GST_COND_SELECT,flv) \ + -Dflx=$(if $(CONFIG_PACKAGE_gst1-mod-flxdec),en,dis)abled \ + $(call GST_COND_SELECT,goom) \ + $(call GST_COND_SELECT,goom2k1) \ + $(call GST_COND_SELECT,icydemux) \ + $(call GST_COND_SELECT,id3demux) \ + $(call GST_COND_SELECT,imagefreeze) \ + $(call GST_COND_SELECT,interleave) \ + $(call GST_COND_SELECT,isomp4) \ + -Dlaw=$(if $(CONFIG_PACKAGE_gst1-mod-mulaw),en,dis)abled \ + $(call GST_COND_SELECT,level) \ + $(call GST_COND_SELECT,matroska) \ + $(call GST_COND_SELECT,monoscope) \ + $(call GST_COND_SELECT,multifile) \ + $(call GST_COND_SELECT,multipart) \ + $(call GST_COND_SELECT,replaygain) \ + $(call GST_COND_SELECT,rtp) \ + $(call GST_COND_SELECT,rtpmanager) \ + $(call GST_COND_SELECT,rtsp) \ + $(call GST_COND_SELECT,shapewipe) \ + $(call GST_COND_SELECT,smpte) \ + $(call GST_COND_SELECT,spectrum) \ + $(call GST_COND_SELECT,udp) \ + $(call GST_COND_SELECT,videobox) \ + $(call GST_COND_SELECT,videofilter) \ + $(call GST_COND_SELECT,videomixer) \ + $(call GST_COND_SELECT,wavenc) \ + $(call GST_COND_SELECT,wavparse) \ + $(call GST_COND_SELECT,y4m) \ \ - --disable-aalib \ - --disable-annodex \ - --disable-bz2 \ - --disable-cairo \ - --disable-directsound \ - --disable-dv1394 \ - --disable-esd \ - --disable-gconf \ - --disable-gconftool \ - --disable-gdk_pixbuf \ - --disable-hal \ - --disable-libcaca \ - --disable-libdv \ - --disable-osx_audio \ - --disable-osx_video \ - --disable-pulse \ - --disable-qtdemux \ - --disable-rtspmanager \ - --disable-shout2 \ - --disable-sunaudio \ - --disable-wavpack \ - --disable-x \ - --disable-xshm \ - --disable-xvideo \ - --disable-y4m \ - --disable-zlib \ + -Daalib=disabled \ + -Dbz2=disabled \ + -Dcairo=disabled \ + -Ddirectsound=disabled \ + -Ddv=disabled \ + -Ddv1394=disabled \ + $(call GST_COND_SELECT,flac) \ + -Dgdk-pixbuf=disabled \ + -Dgtk3=disabled \ + -Djack=disabled \ + $(call GST_COND_SELECT,jpeg) \ + $(call GST_COND_SELECT,lame) \ + -Dlibcaca=disabled \ + $(call GST_COND_SELECT,mpg123) \ + -Doss=$(if $(CONFIG_PACKAGE_gst1-mod-ossaudio),en,dis)abled \ + $(call GST_COND_SELECT,oss4) \ + -Dosxaudio=disabled \ + -Dosxvideo=disabled \ + $(call GST_COND_SELECT,png) \ + -Dpulse=disabled \ + -Dqt5=disabled \ + $(call GST_COND_SELECT,shout2) \ + $(call GST_COND_SELECT,soup) \ + $(call GST_COND_SELECT,speex) \ + -Dtaglib=disabled \ + -Dtwolame=disabled \ + $(call GST_COND_SELECT,vpx) \ + -Dwaveform=disabled \ + -Dwavpack=disabled \ \ - --without-libiconv-prefix \ - --without-libintl-prefix \ - --without-x \ - -EXTRA_LDFLAGS+= \ - -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ - $(if $(ICONV_FULL),-liconv) \ - + -Dximagesrc=disabled \ + -Dv4l2=$(if $(CONFIG_PACKAGE_gst1-mod-video4linux2),en,dis)abled \ + -Dexamples=disabled \ + -Dtests=disabled \ + -Dnls=enabled \ + -Dorc=disabled \ + -Dgobject-cast-checks=disabled \ + -Dglib-asserts=disabled \ + -Dglib-checks=disabled define Package/gst1-plugins-good/install /bin/true @@ -197,8 +247,10 @@ $(eval $(call GstBuildPlugin,interleave,audio interleave,audio,,)) $(eval $(call GstBuildPlugin,isomp4,isomp4 support,audio pbutils riff rtp tag video,,)) #$(eval $(call GstBuildPlugin,jack,jack support,audio,,)) $(eval $(call GstBuildPlugin,jpeg,jpeg support,video,,+libjpeg)) +$(eval $(call GstBuildPlugin,lame,MP3 encoder (using LAME),audio,,+lame-lib)) $(eval $(call GstBuildPlugin,level,audio level,audio,,)) $(eval $(call GstBuildPlugin,matroska,matroska support,audio pbutils riff tag video,,)) +$(eval $(call GstBuildPlugin,mpg123,MP3 decoder (using mpg123),audio tag,,+libid3tag +mpg123)) $(eval $(call GstBuildPlugin,mulaw,mulaw support,audio,,)) $(eval $(call GstBuildPlugin,multifile,multiple files access,video,,)) $(eval $(call GstBuildPlugin,multipart,multipart stream handling,,,)) @@ -212,12 +264,11 @@ $(eval $(call GstBuildPlugin,rtpmanager,RTP manager,audio net rtp tag pbutils vi $(eval $(call GstBuildPlugin,rtp,RTP,audio rtp tag pbutils video,,)) $(eval $(call GstBuildPlugin,rtsp,RTSP,net rtp rtsp sdp,,)) $(eval $(call GstBuildPlugin,shapewipe,shapewipe support,video,,)) -#$(eval $(call GstBuildPlugin,shout2,shout2 support,,,)) +$(eval $(call GstBuildPlugin,shout2,shout2 support,audio,,+libshout)) $(eval $(call GstBuildPlugin,smpte,smpte support,video,,)) $(eval $(call GstBuildPlugin,soup,soup input,audio tag,,+libsoup)) $(eval $(call GstBuildPlugin,spectrum,spectrum data output,audio fft,,)) -#$(eval $(call GstBuildPlugin,speex,speex support,audio tag,,)) -#$(eval $(call GstBuildPlugin,sty4menc,sty4menc support,video,,)) +$(eval $(call GstBuildPlugin,speex,speex support,audio tag,,+libspeex)) #$(eval $(call GstBuildPlugin,taglib,taglib support,tag,,)) $(eval $(call GstBuildPlugin,udp,UDP,net,,)) $(eval $(call GstBuildPlugin,video4linux2,video4linux2 support,video allocators,,+libv4l)) @@ -230,6 +281,7 @@ $(eval $(call GstBuildPlugin,wavenc,Wav encoder,riff,,)) #$(eval $(call GstBuildPlugin,wavpack,Wav packer,audio riff tag,,)) $(eval $(call GstBuildPlugin,wavparse,Wav parser,audio riff tag,,)) #$(eval $(call GstBuildPlugin,ximagesrc,ximagesrc support,video,,)) +#$(eval $(call GstBuildPlugin,y4m,sty4menc support,video,,)) $(eval $(call BuildPackage,gstreamer1-plugins-good)) $(eval $(call BuildPackage,gst1-plugins-good)) diff --git a/multimedia/gst1-plugins-good/patches/001-no-translations.patch b/multimedia/gst1-plugins-good/patches/001-no-translations.patch deleted file mode 100644 index 6b78b282..00000000 --- a/multimedia/gst1-plugins-good/patches/001-no-translations.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -u --recursive gst-plugins-good-1.12.4-vanilla/configure.ac gst-plugins-good-1.12.4/configure.ac ---- gst-plugins-good-1.12.4-vanilla/configure.ac 2018-02-11 10:34:37.773144289 -0500 -+++ gst-plugins-good-1.12.4/configure.ac 2018-02-11 10:35:17.103223474 -0500 -@@ -1061,7 +1061,6 @@ - sys/v4l2/Makefile - sys/waveform/Makefile - sys/ximage/Makefile --po/Makefile.in - tests/Makefile - tests/check/Makefile - tests/examples/Makefile -diff -u --recursive gst-plugins-good-1.12.4-vanilla/Makefile.am gst-plugins-good-1.12.4/Makefile.am ---- gst-plugins-good-1.12.4-vanilla/Makefile.am 2018-02-11 10:34:37.786144315 -0500 -+++ gst-plugins-good-1.12.4/Makefile.am 2018-02-11 10:35:23.529236411 -0500 -@@ -4,7 +4,6 @@ - gst sys ext \ - tests \ - docs \ -- po \ - common \ - m4 \ - pkgconfig diff --git a/multimedia/gst1-plugins-good/patches/002-no-tests.patch b/multimedia/gst1-plugins-good/patches/002-no-tests.patch deleted file mode 100644 index 187009fd..00000000 --- a/multimedia/gst1-plugins-good/patches/002-no-tests.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -u --recursive gst-plugins-good-1.12.4-vanilla/configure.ac gst-plugins-good-1.12.4/configure.ac ---- gst-plugins-good-1.12.4-vanilla/configure.ac 2018-02-11 10:36:40.335391048 -0500 -+++ gst-plugins-good-1.12.4/configure.ac 2018-02-11 10:37:22.304475546 -0500 -@@ -1061,20 +1061,6 @@ - sys/v4l2/Makefile - sys/waveform/Makefile - sys/ximage/Makefile --tests/Makefile --tests/check/Makefile --tests/examples/Makefile --tests/examples/audiofx/Makefile --tests/examples/cairo/Makefile --tests/examples/equalizer/Makefile --tests/examples/jack/Makefile --tests/examples/level/Makefile --tests/examples/rtp/Makefile --tests/examples/shapewipe/Makefile --tests/examples/spectrum/Makefile --tests/examples/v4l2/Makefile --tests/files/Makefile --tests/icles/Makefile - common/Makefile - common/m4/Makefile - m4/Makefile -diff -u --recursive gst-plugins-good-1.12.4-vanilla/Makefile.am gst-plugins-good-1.12.4/Makefile.am ---- gst-plugins-good-1.12.4-vanilla/Makefile.am 2018-02-11 10:36:40.335391048 -0500 -+++ gst-plugins-good-1.12.4/Makefile.am 2018-02-11 10:37:37.242505621 -0500 -@@ -2,7 +2,6 @@ - - ALWAYS_SUBDIRS = \ - gst sys ext \ -- tests \ - docs \ - common \ - m4 \ diff --git a/multimedia/gst1-plugins-good/patches/003-no-docs.patch b/multimedia/gst1-plugins-good/patches/003-no-docs.patch deleted file mode 100644 index f13cb61a..00000000 --- a/multimedia/gst1-plugins-good/patches/003-no-docs.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -u --recursive gst-plugins-good-1.12.4-vanilla/configure.ac gst-plugins-good-1.12.4/configure.ac ---- gst-plugins-good-1.12.4-vanilla/configure.ac 2018-02-11 10:37:22.304475546 -0500 -+++ gst-plugins-good-1.12.4/configure.ac 2018-02-11 10:38:15.248581736 -0500 -@@ -1064,9 +1064,6 @@ - common/Makefile - common/m4/Makefile - m4/Makefile --docs/Makefile --docs/plugins/Makefile --docs/version.entities - pkgconfig/Makefile - pkgconfig/gstreamer-plugins-good-uninstalled.pc - ) -diff -u --recursive gst-plugins-good-1.12.4-vanilla/Makefile.am gst-plugins-good-1.12.4/Makefile.am ---- gst-plugins-good-1.12.4-vanilla/Makefile.am 2018-02-11 10:37:37.242505621 -0500 -+++ gst-plugins-good-1.12.4/Makefile.am 2018-02-11 10:38:28.838608856 -0500 -@@ -2,7 +2,6 @@ - - ALWAYS_SUBDIRS = \ - gst sys ext \ -- docs \ - common \ - m4 \ - pkgconfig diff --git a/multimedia/gst1-plugins-ugly/Makefile b/multimedia/gst1-plugins-ugly/Makefile index cd2b4251..de6e50a7 100644 --- a/multimedia/gst1-plugins-ugly/Makefile +++ b/multimedia/gst1-plugins-ugly/Makefile @@ -8,31 +8,28 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gst1-plugins-ugly -PKG_VERSION:=1.12.4 +PKG_VERSION:=1.16.2 PKG_RELEASE:=1 +PKG_SOURCE:=gst-plugins-ugly-$(PKG_VERSION).tar.xz +PKG_SOURCE_URL:=https://gstreamer.freedesktop.org/src/gst-plugins-ugly +PKG_HASH:=5500415b865e8b62775d4742cbb9f37146a50caecfc0e7a6fc0160d3c560fbca +PKG_BUILD_DIR:=$(BUILD_DIR)/gst-plugins-ugly-$(PKG_VERSION) + PKG_MAINTAINER:=W. Michael Petullo \ Ted Hess - -PKG_LICENSE:=LGPLv2 +PKG_LICENSE:=LGPL-2.1-or-later PKG_LICENSE_FILES:=COPYING -PKG_BUILD_DIR:=$(BUILD_DIR)/gst-plugins-ugly-$(PKG_VERSION) -PKG_SOURCE:=gst-plugins-ugly-$(PKG_VERSION).tar.xz -PKG_SOURCE_URL:=http://gstreamer.freedesktop.org/src/gst-plugins-ugly/ -PKG_HASH:=1c165b8d888ed350acd8e6ac9f6fe06508e6fcc0a3afc6ccc9fbeb30df9be522 - -PKG_CONFIG_DEPENDS:= \ - CONFIG_PACKAGE_gst1-mod-asf \ - CONFIG_PACKAGE_gst1-mod-lame \ - CONFIG_PACKAGE_gst1-mod-mpg123 \ - CONFIG_PACKAGE_gst1-mod-mpeg2dec \ - -PKG_FIXUP:=autoreconf PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk +include ../../devel/meson/meson.mk + +PKG_CONFIG_DEPENDS:= \ + CONFIG_PACKAGE_gst1-mod-asf \ + CONFIG_PACKAGE_gst1-mod-mpeg2dec \ GST_UGLY_MODULES:= @@ -40,7 +37,7 @@ define Package/gstreamer1-ugly/Default CATEGORY:=Multimedia SECTION:=multimedia TITLE:=GStreamer - URL:=http://gstreamer.freedesktop.org/ + URL:=https://gstreamer.freedesktop.org/ DEPENDS:= +libgstreamer1 $(ICONV_DEPENDS) endef @@ -91,41 +88,32 @@ define Package/gstreamer1-plugins-ugly/config endef -GST_COND_SELECT = $(patsubst %,$(if $(CONFIG_PACKAGE_gst1-mod-$(1)),--enable,--disable)-%,$(1)) +GST_COND_SELECT = -D$(1)=$(if $(CONFIG_PACKAGE_gst1-mod-$(1)),en,dis)abled GST_VERSION:=1.0 -CONFIGURE_ARGS += \ - --disable-debug \ - --disable-examples \ +MESON_ARGS += \ + -Dasfdemux=$(if $(CONFIG_PACKAGE_gst1-mod-asf),en,dis)abled \ + -Ddvdlpcmdec=disabled \ + -Ddvdsub=disabled \ + -Drealmedia=disabled \ + -Dxingmux=disabled \ \ - --disable-a52dec \ - --disable-amrnb \ - --disable-amrwb \ - $(call GST_COND_SELECT,asf) \ - --disable-cdio \ - --disable-dvdlpcmdec \ - --disable-dvdread \ - --disable-dvdsub \ - --disable-iec958 \ - $(call GST_COND_SELECT,lame) \ - $(call GST_COND_SELECT,mpg123) \ + -Da52dec=disabled \ + -Damrnb=disabled \ + -Damrwbdec=disabled \ + -Dcdio=disabled \ + -Ddvdread=disabled \ $(call GST_COND_SELECT,mpeg2dec) \ - --disable-mpegaudioparse \ - --disable-mpegstream \ - --disable-realmedia \ - --disable-sidplay \ - --disable-synaesthesia \ - --disable-twolame \ - --disable-x264 \ + -Dsidplay=disabled \ + -Dx264=disabled \ \ - --without-libiconv-prefix \ - --without-libintl-prefix \ - -EXTRA_LDFLAGS+= \ - -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ - $(if $(ICONV_FULL),-liconv) \ - + -Dnls=enabled \ + -Dorc=disabled \ + -Dtests=disabled \ + -Dgobject-cast-checks=disabled \ + -Dglib-asserts=disabled \ + -Dglib-checks=disabled define Package/gst1-plugins-ugly/install /bin/true @@ -168,8 +156,6 @@ define GstBuildPlugin endef $(eval $(call GstBuildPlugin,asf,ASF demuxer,audio video riff rtp rtsp sdp tag,,)) -$(eval $(call GstBuildPlugin,lame,MP3 encoder (using LAME),audio,,+lame-lib)) -$(eval $(call GstBuildPlugin,mpg123,MP3 decoder (using mpg123),audio tag,,+libid3tag +mpg123)) $(eval $(call GstBuildPlugin,mpeg2dec,MPEG decoder,video,,+libmpeg2)) $(eval $(call BuildPackage,gstreamer1-plugins-ugly)) diff --git a/multimedia/gst1-plugins-ugly/patches/001-no-translations.patch b/multimedia/gst1-plugins-ugly/patches/001-no-translations.patch deleted file mode 100644 index 94ca8e2d..00000000 --- a/multimedia/gst1-plugins-ugly/patches/001-no-translations.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -u --recursive gst-plugins-ugly-1.12.4-vanilla/configure.ac gst-plugins-ugly-1.12.4/configure.ac ---- gst-plugins-ugly-1.12.4-vanilla/configure.ac 2018-02-11 20:18:05.152825587 -0500 -+++ gst-plugins-ugly-1.12.4/configure.ac 2018-02-11 20:18:33.859767165 -0500 -@@ -474,7 +474,6 @@ - tests/check/Makefile - tests/files/Makefile - m4/Makefile --po/Makefile.in - pkgconfig/Makefile - pkgconfig/gstreamer-plugins-ugly-uninstalled.pc - ) -diff -u --recursive gst-plugins-ugly-1.12.4-vanilla/Makefile.am gst-plugins-ugly-1.12.4/Makefile.am ---- gst-plugins-ugly-1.12.4-vanilla/Makefile.am 2018-02-11 20:18:05.157825577 -0500 -+++ gst-plugins-ugly-1.12.4/Makefile.am 2018-02-11 20:18:23.491788265 -0500 -@@ -1,7 +1,7 @@ - DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc - - SUBDIRS = \ -- gst-libs gst ext docs m4 tests common pkgconfig po -+ gst-libs gst ext docs m4 tests common pkgconfig - - EXTRA_DIST = \ - depcomp \ diff --git a/multimedia/gst1-plugins-ugly/patches/002-no-tests.patch b/multimedia/gst1-plugins-ugly/patches/002-no-tests.patch deleted file mode 100644 index b95d0e60..00000000 --- a/multimedia/gst1-plugins-ugly/patches/002-no-tests.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -u --recursive gst-plugins-ugly-1.12.4-vanilla/configure.ac gst-plugins-ugly-1.12.4/configure.ac ---- gst-plugins-ugly-1.12.4-vanilla/configure.ac 2018-02-11 20:19:01.875710150 -0500 -+++ gst-plugins-ugly-1.12.4/configure.ac 2018-02-11 20:19:27.117658780 -0500 -@@ -470,9 +470,6 @@ - docs/Makefile - docs/plugins/Makefile - docs/version.entities --tests/Makefile --tests/check/Makefile --tests/files/Makefile - m4/Makefile - pkgconfig/Makefile - pkgconfig/gstreamer-plugins-ugly-uninstalled.pc -diff -u --recursive gst-plugins-ugly-1.12.4-vanilla/Makefile.am gst-plugins-ugly-1.12.4/Makefile.am ---- gst-plugins-ugly-1.12.4-vanilla/Makefile.am 2018-02-11 20:19:01.875710150 -0500 -+++ gst-plugins-ugly-1.12.4/Makefile.am 2018-02-11 20:19:34.402643954 -0500 -@@ -1,7 +1,7 @@ - DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc - - SUBDIRS = \ -- gst-libs gst ext docs m4 tests common pkgconfig -+ gst-libs gst ext docs m4 common pkgconfig - - EXTRA_DIST = \ - depcomp \ diff --git a/multimedia/gst1-plugins-ugly/patches/003-no-docs.patch b/multimedia/gst1-plugins-ugly/patches/003-no-docs.patch deleted file mode 100644 index 8e56c472..00000000 --- a/multimedia/gst1-plugins-ugly/patches/003-no-docs.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -u --recursive gst-plugins-ugly-1.12.4-vanilla/configure.ac gst-plugins-ugly-1.12.4/configure.ac ---- gst-plugins-ugly-1.12.4-vanilla/configure.ac 2018-02-11 20:19:47.318617668 -0500 -+++ gst-plugins-ugly-1.12.4/configure.ac 2018-02-11 20:19:56.171599652 -0500 -@@ -467,9 +467,6 @@ - ext/sidplay/Makefile - ext/twolame/Makefile - ext/x264/Makefile --docs/Makefile --docs/plugins/Makefile --docs/version.entities - m4/Makefile - pkgconfig/Makefile - pkgconfig/gstreamer-plugins-ugly-uninstalled.pc -diff -u --recursive gst-plugins-ugly-1.12.4-vanilla/Makefile.am gst-plugins-ugly-1.12.4/Makefile.am ---- gst-plugins-ugly-1.12.4-vanilla/Makefile.am 2018-02-11 20:19:47.318617668 -0500 -+++ gst-plugins-ugly-1.12.4/Makefile.am 2018-02-11 20:20:03.662584407 -0500 -@@ -1,7 +1,7 @@ - DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc - - SUBDIRS = \ -- gst-libs gst ext docs m4 common pkgconfig -+ gst-libs gst ext m4 common pkgconfig - - EXTRA_DIST = \ - depcomp \ diff --git a/multimedia/gstreamer1/Makefile b/multimedia/gstreamer1/Makefile index 7e193f54..b0293ac7 100644 --- a/multimedia/gstreamer1/Makefile +++ b/multimedia/gstreamer1/Makefile @@ -8,34 +8,33 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gstreamer1 -PKG_VERSION:=1.12.4 -PKG_RELEASE:=2 +PKG_VERSION:=1.16.2 +PKG_RELEASE:=1 + +PKG_SOURCE:=gstreamer-$(PKG_VERSION).tar.xz +PKG_SOURCE_URL:=https://gstreamer.freedesktop.org/src/gstreamer +PKG_HASH:=e3f044246783fd685439647373fa13ba14f7ab0b346eadd06437092f8419e94e +PKG_BUILD_DIR:=$(BUILD_DIR)/gstreamer-$(PKG_VERSION) PKG_MAINTAINER:=W. Michael Petullo \ Ted Hess - -PKG_LICENSE:=LGPLv2 +PKG_LICENSE:=LGPL-2.1-or-later PKG_LICENSE_FILES:=COPYING - -PKG_BUILD_DIR:=$(BUILD_DIR)/gstreamer-$(PKG_VERSION) -PKG_SOURCE:=gstreamer-$(PKG_VERSION).tar.xz -PKG_SOURCE_URL:=http://gstreamer.freedesktop.org/src/gstreamer/ -PKG_HASH:=5a8704aa4c2eeb04da192c4a9942f94f860ac1a585de90d9f914bac26a970674 - -PKG_FIXUP:=autoreconf -PKG_REMOVE_FILES:=autogen.sh aclocal.m4 +PKG_CPE_ID:=cpe:/a:gstreamer_project:gstreamer PKG_INSTALL:=1 +PKG_BUILD_DEPENDS:=meson/host glib2/host include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk +include ../../devel/meson/meson.mk define Package/gstreamer1/Default CATEGORY:=Multimedia SECTION:=multimedia TITLE:=GStreamer - URL:=http://gstreamer.freedesktop.org/ - DEPENDS:= $(ICONV_DEPENDS) $(INTL_DEPENDS) +libdw +libelf + URL:=https://gstreamer.freedesktop.org/ + DEPENDS:= $(ICONV_DEPENDS) $(INTL_DEPENDS) endef define Package/gstreamer1/description/Default @@ -112,24 +111,32 @@ define Package/libgstreamer1/description . This package contains the GStreamer core library. endef - + GST_VERSION:=1.0 -CONFIGURE_ARGS += \ - --enable-static \ - --disable-examples \ - --disable-tests \ - --disable-valgrind \ - --disable-gst-tracer-hooks \ - --with-unwind=no \ - --without-libiconv-prefix \ - --without-libintl-prefix \ - --without-x \ - -EXTRA_LDFLAGS+= \ - -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ - $(if $(ICONV_FULL),-liconv) +MESON_ARGS += \ + -Dgst_debug=false \ + -Dgst_parse=true \ + -Dregistry=false \ + -Dtracer_hooks=false \ + -Dptp-helper-setuid-user=none \ + -Dextra-checks=false \ + -Doption-parsing=false \ + -Dpoisoning=false \ + -Dcheck=enabled \ + -Dlibunwind=disabled \ + -Dlibdw=disabled \ + -Ddbghelp=disabled \ + -Dbash-completion=disabled \ + -Dexamples=disabled \ + -Dbenchmarks=disabled \ + -Dtools=enabled \ + -Dgtk_doc=disabled \ + -Dintrospection=disabled \ + -Dnls=enabled \ + -Dgobject-cast-checks=disabled \ + -Dglib-asserts=disabled define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include/gstreamer-$(GST_VERSION) @@ -139,12 +146,12 @@ define Build/InstallDev ) $(INSTALL_DIR) $(1)/usr/lib ( cd $(PKG_INSTALL_DIR); $(CP) \ - ./usr/lib/libgst*-$(GST_VERSION).{a,la,so*} \ + ./usr/lib/libgst*-$(GST_VERSION).so* \ $(1)/usr/lib/ \ ) $(INSTALL_DIR) $(1)/usr/lib/gstreamer-$(GST_VERSION) ( cd $(PKG_INSTALL_DIR); $(CP) \ - ./usr/lib/gstreamer-$(GST_VERSION)/libgst*.{la,so} \ + ./usr/lib/gstreamer-$(GST_VERSION)/libgst*.so \ $(1)/usr/lib/gstreamer-$(GST_VERSION)/ \ ) $(INSTALL_DIR) $(1)/usr/lib/pkgconfig @@ -189,7 +196,7 @@ define Package/libgstreamer1/install ./usr/lib/gstreamer-$(GST_VERSION)/libgst*.so \ $(1)/usr/lib/gstreamer-$(GST_VERSION)/ \ ) - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/gstreamer-$(GST_VERSION)/gst-plugin-scanner \ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/libexec/gstreamer-$(GST_VERSION)/gst-plugin-scanner \ $(1)/usr/lib/gstreamer-$(GST_VERSION) endef diff --git a/multimedia/gstreamer1/patches/001-no-translations.patch b/multimedia/gstreamer1/patches/001-no-translations.patch index 1202812b..e6c68640 100644 --- a/multimedia/gstreamer1/patches/001-no-translations.patch +++ b/multimedia/gstreamer1/patches/001-no-translations.patch @@ -1,18 +1,6 @@ -diff -u --recursive gstreamer-1.12.4-vanilla/configure.ac gstreamer-1.12.4/configure.ac ---- gstreamer-1.12.4-vanilla/configure.ac 2018-02-10 17:37:16.379378242 -0500 -+++ gstreamer-1.12.4/configure.ac 2018-02-10 17:40:18.742109326 -0500 -@@ -1083,7 +1083,6 @@ - plugins/Makefile - plugins/elements/Makefile - plugins/tracers/Makefile --po/Makefile.in - tests/Makefile - tests/benchmarks/Makefile - tests/check/Makefile -diff -u --recursive gstreamer-1.12.4-vanilla/Makefile.am gstreamer-1.12.4/Makefile.am ---- gstreamer-1.12.4-vanilla/Makefile.am 2018-02-10 17:37:16.390378286 -0500 -+++ gstreamer-1.12.4/Makefile.am 2018-02-10 17:40:29.112150898 -0500 -@@ -9,7 +9,6 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -9,7 +9,6 @@ aclocal_DATA = gst-element-check-1.0.m4 SUBDIRS = pkgconfig \ gst libs plugins tests \ docs \ @@ -20,7 +8,7 @@ diff -u --recursive gstreamer-1.12.4-vanilla/Makefile.am gstreamer-1.12.4/Makefi m4 \ common \ data -@@ -22,7 +21,6 @@ +@@ -22,7 +21,6 @@ endif DIST_SUBDIRS = pkgconfig \ gst libs plugins tools tests \ docs \ @@ -28,3 +16,13 @@ diff -u --recursive gstreamer-1.12.4-vanilla/Makefile.am gstreamer-1.12.4/Makefi m4 \ common \ data +--- a/configure.ac ++++ b/configure.ac +@@ -1108,7 +1108,6 @@ libs/gst/net/Makefile + plugins/Makefile + plugins/elements/Makefile + plugins/tracers/Makefile +-po/Makefile.in + tests/Makefile + tests/benchmarks/Makefile + tests/check/Makefile diff --git a/multimedia/gstreamer1/patches/002-no-tests.patch b/multimedia/gstreamer1/patches/002-no-tests.patch deleted file mode 100644 index bc177daa..00000000 --- a/multimedia/gstreamer1/patches/002-no-tests.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -u --recursive gstreamer-1.12.4-vanilla/configure.ac gstreamer-1.12.4/configure.ac ---- gstreamer-1.12.4-vanilla/configure.ac 2018-02-10 17:43:59.957864211 -0500 -+++ gstreamer-1.12.4/configure.ac 2018-02-10 17:44:19.772930084 -0500 -@@ -1083,20 +1083,6 @@ - plugins/Makefile - plugins/elements/Makefile - plugins/tracers/Makefile --tests/Makefile --tests/benchmarks/Makefile --tests/check/Makefile --tests/misc/Makefile --tests/examples/Makefile --tests/examples/adapter/Makefile --tests/examples/controller/Makefile --tests/examples/stepping/Makefile --tests/examples/helloworld/Makefile --tests/examples/memory/Makefile --tests/examples/netclock/Makefile --tests/examples/ptp/Makefile --tests/examples/streamiddemux/Makefile --tests/examples/streams/Makefile - tools/Makefile - common/Makefile - common/m4/Makefile -diff -u --recursive gstreamer-1.12.4-vanilla/Makefile.am gstreamer-1.12.4/Makefile.am ---- gstreamer-1.12.4-vanilla/Makefile.am 2018-02-10 17:43:59.959864217 -0500 -+++ gstreamer-1.12.4/Makefile.am 2018-02-10 17:44:30.298965075 -0500 -@@ -7,7 +7,7 @@ - aclocal_DATA = gst-element-check-@GST_API_VERSION@.m4 - - SUBDIRS = pkgconfig \ -- gst libs plugins tests \ -+ gst libs plugins \ - docs \ - m4 \ - common \ -@@ -19,7 +19,7 @@ - - # These are all the possible subdirs - DIST_SUBDIRS = pkgconfig \ -- gst libs plugins tools tests \ -+ gst libs plugins tools \ - docs \ - m4 \ - common \ diff --git a/multimedia/gstreamer1/patches/003-no-docs.patch b/multimedia/gstreamer1/patches/003-no-docs.patch deleted file mode 100644 index d7b4a73a..00000000 --- a/multimedia/gstreamer1/patches/003-no-docs.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -u --recursive gstreamer-1.12.4-vanilla/configure.ac gstreamer-1.12.4/configure.ac ---- gstreamer-1.12.4-vanilla/configure.ac 2018-02-10 17:45:28.053157030 -0500 -+++ gstreamer-1.12.4/configure.ac 2018-02-10 17:45:47.703222322 -0500 -@@ -1086,12 +1086,6 @@ - tools/Makefile - common/Makefile - common/m4/Makefile --docs/Makefile --docs/gst/Makefile --docs/gst/gstreamer.types --docs/libs/Makefile --docs/plugins/Makefile --docs/version.entities - m4/Makefile - pkgconfig/Makefile - stamp.h -diff -u --recursive gstreamer-1.12.4-vanilla/Makefile.am gstreamer-1.12.4/Makefile.am ---- gstreamer-1.12.4-vanilla/Makefile.am 2018-02-10 17:45:28.053157030 -0500 -+++ gstreamer-1.12.4/Makefile.am 2018-02-10 17:45:58.940259656 -0500 -@@ -8,7 +8,6 @@ - - SUBDIRS = pkgconfig \ - gst libs plugins \ -- docs \ - m4 \ - common \ - data -@@ -20,7 +19,6 @@ - # These are all the possible subdirs - DIST_SUBDIRS = pkgconfig \ - gst libs plugins tools \ -- docs \ - m4 \ - common \ - data diff --git a/multimedia/gstreamer1/patches/010-gstplugin-use-lazy-symbol-binding.patch b/multimedia/gstreamer1/patches/010-gstplugin-use-lazy-symbol-binding.patch index 84540618..ab72a4ff 100644 --- a/multimedia/gstreamer1/patches/010-gstplugin-use-lazy-symbol-binding.patch +++ b/multimedia/gstreamer1/patches/010-gstplugin-use-lazy-symbol-binding.patch @@ -1,6 +1,6 @@ --- a/gst/gstplugin.c +++ b/gst/gstplugin.c -@@ -732,15 +732,8 @@ _priv_gst_plugin_load_file_for_registry +@@ -777,15 +777,8 @@ _priv_gst_plugin_load_file_for_registry (const gchar * filename, goto return_error; }