Date: Thursday, March 15, 2018 @ 03:00:58 Author: felixonmars Revision: 307915
upgpkg: zbar 0.20-1 bump to fork and split package Modified: zbar/trunk/PKGBUILD Deleted: zbar/trunk/v4l1.patch ------------+ PKGBUILD | 88 ++++++++++++++++++++++++++++++++++++++++++++++++----------- v4l1.patch | 24 ---------------- 2 files changed, 73 insertions(+), 39 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-03-15 02:49:41 UTC (rev 307914) +++ PKGBUILD 2018-03-15 03:00:58 UTC (rev 307915) @@ -4,26 +4,21 @@ # Contributor: Radu Andries <[email protected]> # Contributor: Andy Weidenbaum <[email protected]> -pkgname=zbar -pkgver=0.10 -pkgrel=12 +pkgbase=zbar +pkgname=(zbar zbar-gtk zbar-qt python2-zbar) +pkgver=0.20 +pkgrel=1 pkgdesc="Application and library for reading bar codes from various sources" arch=('x86_64') -url="http://zbar.sourceforge.net/"; +url="https://github.com/procxx/zbar"; license=('LGPL') -depends=('libmagick6' 'libxv' 'python2' 'gtk2' 'pygtk' 'v4l-utils') -makedepends=('qt4' 'python') -conflicts=('zbar-gtk' 'zbar-qt') -provides=("zbar-gtk=$pkgver" "zbar-qt=$pkgver") -optdepends=('qt4: for libzbarqt') -source=("http://downloads.sourceforge.net/project/zbar/zbar/$pkgver/zbar-$pkgver.tar.bz2"; - v4l1.patch) -md5sums=('0fd61eb590ac1bab62a77913c8b086a5' - '284f11ca2a5e009744c4a1b9e92d6953') +makedepends=('libmagick6' 'libxv' 'v4l-utils' 'qt5-x11extras' 'pygtk' 'python' 'xmlto' 'docbook-xsl') +source=("$pkgname-$pkgver.tar.gz::https://github.com/procxx/zbar/archive/$pkgver.tar.gz";) +md5sums=('e7c5edafc35f4c1eee5d9d56e0cfd9de') prepare() { cd zbar-$pkgver - patch -p1 -i ../v4l1.patch + autoreconf -vfi } build() { @@ -31,12 +26,75 @@ PKG_CONFIG_PATH="/usr/lib/imagemagick6/pkgconfig" \ PYTHON="/usr/bin/python2" \ ./configure --prefix=/usr --with-qt --with-gtk CFLAGS="$CFLAGS -DNDEBUG" + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool make } -package() { +package_zbar() { + depends=('libmagick6' 'libsm' 'libxv' 'v4l-utils') + cd zbar-$pkgver make DESTDIR="$pkgdir" install + + rm -r "$pkgdir"/usr/lib/libzbar{gtk,qt}.so* \ + "$pkgdir"/usr/lib/*.a \ + "$pkgdir"/usr/include/zbar/zbargtk.h \ + "$pkgdir"/usr/include/zbar/QZBar*.h \ + "$pkgdir"/usr/lib/pkgconfig/zbar-{gtk,qt}.pc \ + "$pkgdir"/usr/lib/python2.7 \ + "$pkgdir"/usr/bin/zbarcam-* } +package_zbar-gtk() { + depends=('zbar' 'gtk2') + + cd zbar-$pkgver + make DESTDIR="$pkgdir" install + + mv "$pkgdir"/usr/include/zbar/zbargtk.h ./ + + rm -r "$pkgdir"/usr/lib/libzbar{,qt}.so* \ + "$pkgdir"/usr/lib/*.a \ + "$pkgdir"/usr/include/zbar/*.h \ + "$pkgdir"/usr/include/zbar.h \ + "$pkgdir"/usr/lib/pkgconfig/zbar{,-qt}.pc \ + "$pkgdir"/usr/lib/python2.7 \ + "$pkgdir"/usr/share \ + "$pkgdir"/usr/bin/{zbarimg,zbarcam,zbarcam-qt} + + mv ./zbargtk.h "$pkgdir"/usr/include/zbar/ +} + +package_zbar-qt() { + depends=('zbar' 'qt5-x11extras') + + cd zbar-$pkgver + make DESTDIR="$pkgdir" install + + mv "$pkgdir"/usr/include/zbar/QZBar*.h ./ + + rm -r "$pkgdir"/usr/lib/libzbar{,gtk}.so* \ + "$pkgdir"/usr/lib/*.a \ + "$pkgdir"/usr/include/zbar/*.h \ + "$pkgdir"/usr/include/zbar.h \ + "$pkgdir"/usr/lib/pkgconfig/zbar{,-gtk}.pc \ + "$pkgdir"/usr/lib/python2.7 \ + "$pkgdir"/usr/share \ + "$pkgdir"/usr/bin/{zbarimg,zbarcam,zbarcam-gtk} + + mv ./QZBar*.h "$pkgdir"/usr/include/zbar/ +} + +package_python2-zbar() { + depends=('zbar-gtk' 'pygtk') + + cd zbar-$pkgver + make DESTDIR="$pkgdir" install + + rm -r "$pkgdir"/usr/lib/*.so* \ + "$pkgdir"/usr/include \ + "$pkgdir"/usr/lib/pkgconfig \ + "$pkgdir"/usr/{bin,share} +} + # vim:set ts=2 sw=2 et: Deleted: v4l1.patch =================================================================== --- v4l1.patch 2018-03-15 02:49:41 UTC (rev 307914) +++ v4l1.patch 2018-03-15 03:00:58 UTC (rev 307915) @@ -1,24 +0,0 @@ -Thanks to Andy Weidenbaum <[email protected]> for providing this patch! - ---- ./zbar/video/v4l1.c 2013-03-06 23:24:22.996336417 -0800 -+++ ./zbar/video/v4l1.c 2013-03-06 23:29:29.789662369 -0800 -@@ -41,7 +41,7 @@ - #ifdef HAVE_SYS_MMAN_H - # include <sys/mman.h> - #endif --#include <linux/videodev.h> -+#include <libv4l1-videodev.h> - - #include "video.h" - #include "image.h" ---- ./configure 2009-10-23 11:17:24.000000000 -0700 -+++ ./configure 2013-03-06 23:47:33.902966990 -0800 -@@ -18709,7 +18709,7 @@ - if test "x$enable_video" != "xno"; then - if test "x$win32" = "xno"; then - --for ac_header in linux/videodev.h -+for ac_header in libv4l1-videodev.h - do - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` - if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
