From f2bc39d62e7e116514b67e405e91d4cbd33ef175 Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Fri, 23 Jun 2017 18:30:36 +0300 Subject: [PATCH] gst-plugins-bad: Fix building with zbar support --- mingw-w64-gst-plugins-bad/0001-fix-zbar-linking.patch | 11 +++++++++++ mingw-w64-gst-plugins-bad/PKGBUILD | 8 ++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 mingw-w64-gst-plugins-bad/0001-fix-zbar-linking.patch diff --git a/mingw-w64-gst-plugins-bad/0001-fix-zbar-linking.patch b/mingw-w64-gst-plugins-bad/0001-fix-zbar-linking.patch new file mode 100644 index 0000000000..9ebd699866 --- /dev/null +++ b/mingw-w64-gst-plugins-bad/0001-fix-zbar-linking.patch @@ -0,0 +1,11 @@ +--- gst-plugins-bad-1.12.1/ext/zbar/Makefile.am.orig 2017-06-23 12:45:47.347778600 +0300 ++++ gst-plugins-bad-1.12.1/ext/zbar/Makefile.am 2017-06-23 12:45:59.369466200 +0300 +@@ -3,7 +3,7 @@ + libgstzbar_la_SOURCES = gstzbar.c + + libgstzbar_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(ZBAR_CFLAGS) +-libgstzbar_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_API_VERSION@ $(GST_BASE_LIBS) $(GST_LIBS) $(ZBAR_LIBS) ++libgstzbar_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_API_VERSION@ $(GST_BASE_LIBS) $(GST_LIBS) $(ZBAR_LIBS) $(LIBICONV) + libgstzbar_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) + libgstzbar_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS) + diff --git a/mingw-w64-gst-plugins-bad/PKGBUILD b/mingw-w64-gst-plugins-bad/PKGBUILD index a749070452..63eec3fa2a 100644 --- a/mingw-w64-gst-plugins-bad/PKGBUILD +++ b/mingw-w64-gst-plugins-bad/PKGBUILD @@ -28,6 +28,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-celt" "${MINGW_PACKAGE_PREFIX}-gst-plugins-base" "${MINGW_PACKAGE_PREFIX}-gtk3" "${MINGW_PACKAGE_PREFIX}-libass" + "${MINGW_PACKAGE_PREFIX}-libbs2b" "${MINGW_PACKAGE_PREFIX}-libdca" "${MINGW_PACKAGE_PREFIX}-libdvdnav" "${MINGW_PACKAGE_PREFIX}-libexif" @@ -44,25 +45,28 @@ depends=("${MINGW_PACKAGE_PREFIX}-celt" "${MINGW_PACKAGE_PREFIX}-openal" "${MINGW_PACKAGE_PREFIX}-opencv" "${MINGW_PACKAGE_PREFIX}-openexr" + "${MINGW_PACKAGE_PREFIX}-openh264" "${MINGW_PACKAGE_PREFIX}-openjpeg2" "${MINGW_PACKAGE_PREFIX}-orc" "${MINGW_PACKAGE_PREFIX}-schroedinger" "${MINGW_PACKAGE_PREFIX}-soundtouch" "${MINGW_PACKAGE_PREFIX}-x265" - "${MINGW_PACKAGE_PREFIX}-openh264" - "${MINGW_PACKAGE_PREFIX}-libbs2b") + "${MINGW_PACKAGE_PREFIX}-zbar") options=(!libtool strip staticlibs) source=(${url}/src/${_realname}/${_realname}-${pkgver}.tar.xz + 0001-fix-zbar-linking.patch 0002-fix-link-order.patch 0005-Include-glext-h.patch 0006-No-X11-on-_WIN32.patch) sha256sums=('7def8049d1c44e50199023159dfada60af58fd503ef58a020b79044bda705b97' + 'd8c685dad9202dade216d650a3c1f3a8be48e8cd71ca5504960e50b448778e3c' 'd9433cbe0eba170e9228632883a9fe1634354e4e31c2261e5e2dcedca9b0ed6a' '439436d02724c07af95f509647238f271f4717958dcf42dc5adb5a8e6a2108e7' 'da9b9c1cf8ce5ee77f7963a6ffecc2abfbc8d0e3c4ea88a49646c0c98a480e46') prepare() { cd "${srcdir}"/${_realname}-${pkgver} + patch -p1 -i "${srcdir}"/0001-fix-zbar-linking.patch patch -p1 -i "${srcdir}"/0002-fix-link-order.patch patch -p1 -i "${srcdir}"/0005-Include-glext-h.patch patch -p1 -i "${srcdir}"/0006-No-X11-on-_WIN32.patch