From 216f42ee88da75f8973b861ca8ff17118781e48e Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 9 Mar 2020 21:20:22 -0700 Subject: [PATCH] gst1-plugins-ugly: update to 1.16.2 Switched to meson. Fixed license information. Signed-off-by: Rosen Penev (cherry picked from commit 714a18e1bb814cee8ca9f92dfb99ffb3201bacb0) --- multimedia/gst1-plugins-ugly/Makefile | 75 ++++++++----------- .../patches/001-no-translations.patch | 21 ------ 2 files changed, 32 insertions(+), 64 deletions(-) delete mode 100644 multimedia/gst1-plugins-ugly/patches/001-no-translations.patch diff --git a/multimedia/gst1-plugins-ugly/Makefile b/multimedia/gst1-plugins-ugly/Makefile index 7457347c06..de6e50a7ac 100644 --- a/multimedia/gst1-plugins-ugly/Makefile +++ b/multimedia/gst1-plugins-ugly/Makefile @@ -8,30 +8,28 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gst1-plugins-ugly -PKG_VERSION:=1.16.1 +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:=https://gstreamer.freedesktop.org/src/gst-plugins-ugly -PKG_HASH:=4bf913b2ca5195ac3b53b5e3ade2dc7c45d2258507552ddc850c5fa425968a1d - -PKG_CONFIG_DEPENDS:= \ - CONFIG_PACKAGE_gst1-mod-asf \ - CONFIG_PACKAGE_gst1-mod-mpeg2dec \ - -PKG_FIXUP:=autoreconf -PKG_BUILD_PARALLEL:=1 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:= @@ -90,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 \ - --disable-fatal-warnings \ - --disable-glib-asserts \ - --disable-gobject-cast-checks \ - --disable-gtk-doc-html \ - --disable-valgrind \ - --disable-rpath \ +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 \ + -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 \ - --with-pic + -Dnls=enabled \ + -Dorc=disabled \ + -Dtests=disabled \ + -Dgobject-cast-checks=disabled \ + -Dglib-asserts=disabled \ + -Dglib-checks=disabled define Package/gst1-plugins-ugly/install /bin/true 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 10702d2723..0000000000 --- a/multimedia/gst1-plugins-ugly/patches/001-no-translations.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/Makefile.am -+++ b/Makefile.am -@@ -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 \ ---- a/configure.ac -+++ b/configure.ac -@@ -427,7 +427,6 @@ tests/Makefile - tests/check/Makefile - tests/files/Makefile - m4/Makefile --po/Makefile.in - pkgconfig/Makefile - pkgconfig/gstreamer-plugins-ugly-uninstalled.pc - )