[arch-commits] Commit in zbar/repos (8 files)
Bartłomiej Piotrowski
bpiotrowski at archlinux.org
Tue Jun 6 16:53:49 UTC 2017
Date: Tuesday, June 6, 2017 @ 16:53:48
Author: bpiotrowski
Revision: 234997
archrelease: copy trunk to community-i686, community-x86_64
Added:
zbar/repos/community-i686/PKGBUILD
(from rev 234996, zbar/trunk/PKGBUILD)
zbar/repos/community-i686/v4l1.patch
(from rev 234996, zbar/trunk/v4l1.patch)
zbar/repos/community-x86_64/PKGBUILD
(from rev 234996, zbar/trunk/PKGBUILD)
zbar/repos/community-x86_64/v4l1.patch
(from rev 234996, zbar/trunk/v4l1.patch)
Deleted:
zbar/repos/community-i686/PKGBUILD
zbar/repos/community-i686/v4l1.patch
zbar/repos/community-x86_64/PKGBUILD
zbar/repos/community-x86_64/v4l1.patch
-----------------------------+
/PKGBUILD | 82 ++++++++++++++++++++++++++++++++++++++++++
/v4l1.patch | 48 ++++++++++++++++++++++++
community-i686/PKGBUILD | 39 -------------------
community-i686/v4l1.patch | 24 ------------
community-x86_64/PKGBUILD | 39 -------------------
community-x86_64/v4l1.patch | 24 ------------
6 files changed, 130 insertions(+), 126 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2017-06-06 16:53:35 UTC (rev 234996)
+++ community-i686/PKGBUILD 2017-06-06 16:53:48 UTC (rev 234997)
@@ -1,39 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at gmail.com>
-# Contributor: Marti Raudsepp <marti at juffo.org>
-# Contributor: Radu Andries <admiral0 at tuxfamily.org>
-# Contributor: Andy Weidenbaum <archbaum at gmail.com>
-
-pkgname=zbar
-pkgver=0.10
-pkgrel=9
-pkgdesc="Application and library for reading bar codes from various sources"
-arch=('i686' 'x86_64')
-url="http://zbar.sourceforge.net/"
-license=('LGPL')
-depends=('imagemagick' 'libxv' 'python2' 'gtk2' 'qt4' 'pygtk' 'v4l-utils')
-conflicts=('zbar-gtk' 'zbar-qt')
-provides=("zbar-gtk=$pkgver" "zbar-qt=$pkgver")
-source=("http://downloads.sourceforge.net/project/zbar/zbar/$pkgver/zbar-$pkgver.tar.bz2"
- v4l1.patch)
-md5sums=('0fd61eb590ac1bab62a77913c8b086a5'
- '284f11ca2a5e009744c4a1b9e92d6953')
-
-prepare() {
- cd zbar-$pkgver
- patch -p1 -i ../v4l1.patch
-}
-
-build() {
- cd zbar-$pkgver
-
- ./configure --prefix=/usr --with-qt --with-gtk CFLAGS="$CFLAGS -DNDEBUG"
- make
-}
-
-package() {
- cd zbar-$pkgver
- make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
Copied: zbar/repos/community-i686/PKGBUILD (from rev 234996, zbar/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2017-06-06 16:53:48 UTC (rev 234997)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at gmail.com>
+# Contributor: Marti Raudsepp <marti at juffo.org>
+# Contributor: Radu Andries <admiral0 at tuxfamily.org>
+# Contributor: Andy Weidenbaum <archbaum at gmail.com>
+
+pkgname=zbar
+pkgver=0.10
+pkgrel=10
+pkgdesc="Application and library for reading bar codes from various sources"
+arch=('i686' 'x86_64')
+url="http://zbar.sourceforge.net/"
+license=('LGPL')
+depends=('imagemagick' 'libxv' 'python2' 'gtk2' 'pygtk' 'v4l-utils')
+makedepends=('qt4')
+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')
+
+prepare() {
+ cd zbar-$pkgver
+ patch -p1 -i ../v4l1.patch
+}
+
+build() {
+ cd zbar-$pkgver
+
+ ./configure --prefix=/usr --with-qt --with-gtk CFLAGS="$CFLAGS -DNDEBUG"
+ make
+}
+
+package() {
+ cd zbar-$pkgver
+ make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: community-i686/v4l1.patch
===================================================================
--- community-i686/v4l1.patch 2017-06-06 16:53:35 UTC (rev 234996)
+++ community-i686/v4l1.patch 2017-06-06 16:53:48 UTC (rev 234997)
@@ -1,24 +0,0 @@
-Thanks to Andy Weidenbaum <archbaum at gmail.com> 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
Copied: zbar/repos/community-i686/v4l1.patch (from rev 234996, zbar/trunk/v4l1.patch)
===================================================================
--- community-i686/v4l1.patch (rev 0)
+++ community-i686/v4l1.patch 2017-06-06 16:53:48 UTC (rev 234997)
@@ -0,0 +1,24 @@
+Thanks to Andy Weidenbaum <archbaum at gmail.com> 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
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2017-06-06 16:53:35 UTC (rev 234996)
+++ community-x86_64/PKGBUILD 2017-06-06 16:53:48 UTC (rev 234997)
@@ -1,39 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at gmail.com>
-# Contributor: Marti Raudsepp <marti at juffo.org>
-# Contributor: Radu Andries <admiral0 at tuxfamily.org>
-# Contributor: Andy Weidenbaum <archbaum at gmail.com>
-
-pkgname=zbar
-pkgver=0.10
-pkgrel=9
-pkgdesc="Application and library for reading bar codes from various sources"
-arch=('i686' 'x86_64')
-url="http://zbar.sourceforge.net/"
-license=('LGPL')
-depends=('imagemagick' 'libxv' 'python2' 'gtk2' 'qt4' 'pygtk' 'v4l-utils')
-conflicts=('zbar-gtk' 'zbar-qt')
-provides=("zbar-gtk=$pkgver" "zbar-qt=$pkgver")
-source=("http://downloads.sourceforge.net/project/zbar/zbar/$pkgver/zbar-$pkgver.tar.bz2"
- v4l1.patch)
-md5sums=('0fd61eb590ac1bab62a77913c8b086a5'
- '284f11ca2a5e009744c4a1b9e92d6953')
-
-prepare() {
- cd zbar-$pkgver
- patch -p1 -i ../v4l1.patch
-}
-
-build() {
- cd zbar-$pkgver
-
- ./configure --prefix=/usr --with-qt --with-gtk CFLAGS="$CFLAGS -DNDEBUG"
- make
-}
-
-package() {
- cd zbar-$pkgver
- make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
Copied: zbar/repos/community-x86_64/PKGBUILD (from rev 234996, zbar/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2017-06-06 16:53:48 UTC (rev 234997)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at gmail.com>
+# Contributor: Marti Raudsepp <marti at juffo.org>
+# Contributor: Radu Andries <admiral0 at tuxfamily.org>
+# Contributor: Andy Weidenbaum <archbaum at gmail.com>
+
+pkgname=zbar
+pkgver=0.10
+pkgrel=10
+pkgdesc="Application and library for reading bar codes from various sources"
+arch=('i686' 'x86_64')
+url="http://zbar.sourceforge.net/"
+license=('LGPL')
+depends=('imagemagick' 'libxv' 'python2' 'gtk2' 'pygtk' 'v4l-utils')
+makedepends=('qt4')
+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')
+
+prepare() {
+ cd zbar-$pkgver
+ patch -p1 -i ../v4l1.patch
+}
+
+build() {
+ cd zbar-$pkgver
+
+ ./configure --prefix=/usr --with-qt --with-gtk CFLAGS="$CFLAGS -DNDEBUG"
+ make
+}
+
+package() {
+ cd zbar-$pkgver
+ make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: community-x86_64/v4l1.patch
===================================================================
--- community-x86_64/v4l1.patch 2017-06-06 16:53:35 UTC (rev 234996)
+++ community-x86_64/v4l1.patch 2017-06-06 16:53:48 UTC (rev 234997)
@@ -1,24 +0,0 @@
-Thanks to Andy Weidenbaum <archbaum at gmail.com> 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
Copied: zbar/repos/community-x86_64/v4l1.patch (from rev 234996, zbar/trunk/v4l1.patch)
===================================================================
--- community-x86_64/v4l1.patch (rev 0)
+++ community-x86_64/v4l1.patch 2017-06-06 16:53:48 UTC (rev 234997)
@@ -0,0 +1,24 @@
+Thanks to Andy Weidenbaum <archbaum at gmail.com> 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
More information about the arch-commits
mailing list