summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
Diffstat (limited to 'extra')
-rw-r--r--extra/bzflag/PKGBUILD5
-rw-r--r--extra/ffmpeg/PKGBUILD13
-rw-r--r--extra/ffmpeg/h264-vdpau.patch26
-rw-r--r--extra/fsarchiver/PKGBUILD6
-rw-r--r--extra/glu/PKGBUILD5
-rw-r--r--extra/libpng/PKGBUILD10
-rw-r--r--extra/libtorrent-rasterbar/PKGBUILD8
-rw-r--r--extra/mtr/PKGBUILD29
-rw-r--r--extra/mtr/mtr-glib2.patch26
-rw-r--r--extra/nspr/PKGBUILD6
-rw-r--r--extra/nss/PKGBUILD18
-rw-r--r--extra/sane/PKGBUILD19
-rw-r--r--extra/sane/kodakaio.c.patch11
-rw-r--r--extra/sane/libv4l-0.8.3.patch64
-rw-r--r--extra/sane/network.patch42
-rw-r--r--extra/sane/sane.xinetd2
-rw-r--r--extra/sane/xerox_mfp_fix_usb_devices.patch67
-rw-r--r--extra/swt/PKGBUILD9
-rw-r--r--extra/tomcat-native/PKGBUILD12
19 files changed, 154 insertions, 224 deletions
diff --git a/extra/bzflag/PKGBUILD b/extra/bzflag/PKGBUILD
index a565f2d7c..e0fb01e87 100644
--- a/extra/bzflag/PKGBUILD
+++ b/extra/bzflag/PKGBUILD
@@ -1,18 +1,17 @@
-# $Id: PKGBUILD 169739 2012-10-27 23:41:24Z eric $
+# $Id: PKGBUILD 178623 2013-02-25 23:15:25Z bisson $
# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
# Contributor: Kevin Piche <kevin@archlinux.org>
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
pkgname=bzflag
pkgver=2.4.2
-pkgrel=2
+pkgrel=3
pkgdesc='Multiplayer 3D tank battle game'
url='http://bzflag.org/'
license=('LGPL')
options=('!libtool')
arch=('i686' 'x86_64')
depends=('curl' 'glew' 'glu' 'sdl')
-makedepends=('mesa') # glu requires <GL/gl.h>
source=("http://downloads.sourceforge.net/project/bzflag/bzflag%20source/${pkgver}/bzflag-${pkgver}.tar.bz2")
sha1sums=('36c67c0734a1318b34b39ed0da49606e05ebd291')
diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD
index 2662b40e5..ea369be40 100644
--- a/extra/ffmpeg/PKGBUILD
+++ b/extra/ffmpeg/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 178409 2013-02-21 12:49:48Z ioni $
+# $Id: PKGBUILD 178756 2013-02-26 18:03:18Z ioni $
# Maintainer : Ionut Biru <ibiru@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
# Contributor: Paul Mattal <paul@archlinux.org>
pkgname=ffmpeg
-pkgver=1.1.2
-pkgrel=3
+pkgver=1.1.3
+pkgrel=1
epoch=1
pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix"
arch=('i686' 'x86_64')
@@ -18,15 +18,12 @@ depends=(
'v4l-utils' 'x264' 'xvidcore' 'zlib'
)
makedepends=('libvdpau' 'yasm')
-source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2
- h264-vdpau.patch)
-sha256sums=('dc91e4a2499b05740cfddc2b679694e5c0f2ca20c94191de82d7eb200e8c48ce'
- 'f55f31a40627ac375fa903c958f34af0f4c72dd9f64dd5f4f64320bb6f126f42')
+source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2)
+sha256sums=('a70057eba6256fab7342f863e7bb556d14cbed207b5b5b884a0879d3f16ca0a8')
build() {
cd $pkgname-$pkgver
- patch -Np1 -i ../h264-vdpau.patch
./configure \
--prefix=/usr \
--disable-debug \
diff --git a/extra/ffmpeg/h264-vdpau.patch b/extra/ffmpeg/h264-vdpau.patch
deleted file mode 100644
index 75ebe306f..000000000
--- a/extra/ffmpeg/h264-vdpau.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=blobdiff_plain;f=libavcodec%2Fh264.c;h=da749a241d5647751cb5a961429abb6657a79a00;hp=56ef1092bd4509697f11b76ae97757bbc03aef14;hb=c6f59b95c529baf2ea6729ab9089fddce3ddd86a;hpb=6407800521d26b103db4c22d9de709e957381e4b
-
-diff --git a/libavcodec/h264.c b/libavcodec/h264.c
-index 56ef109..da749a2 100644
---- a/libavcodec/h264.c
-+++ b/libavcodec/h264.c
-@@ -2537,11 +2537,17 @@ static enum PixelFormat get_pixel_format(H264Context *h)
- return s->avctx->color_range == AVCOL_RANGE_JPEG ? AV_PIX_FMT_YUVJ422P
- : AV_PIX_FMT_YUV422P;
- } else {
-- return s->avctx->get_format(s->avctx, s->avctx->codec->pix_fmts ?
-+ int i;
-+ const enum AVPixelFormat * fmt = s->avctx->codec->pix_fmts ?
- s->avctx->codec->pix_fmts :
- s->avctx->color_range == AVCOL_RANGE_JPEG ?
- hwaccel_pixfmt_list_h264_jpeg_420 :
-- ff_hwaccel_pixfmt_list_420);
-+ ff_hwaccel_pixfmt_list_420;
-+
-+ for (i=0; fmt[i] != AV_PIX_FMT_NONE; i++)
-+ if (fmt[i] == s->avctx->pix_fmt)
-+ return fmt[i];
-+ return s->avctx->get_format(s->avctx, fmt);
- }
- break;
- default:
diff --git a/extra/fsarchiver/PKGBUILD b/extra/fsarchiver/PKGBUILD
index b911565e7..82a8321e3 100644
--- a/extra/fsarchiver/PKGBUILD
+++ b/extra/fsarchiver/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 177799 2013-02-09 02:58:49Z eric $
+# $Id: PKGBUILD 178753 2013-02-26 16:58:17Z eric $
# Maintainer:
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
pkgname=fsarchiver
-pkgver=0.6.16
+pkgver=0.6.17
pkgrel=1
pkgdesc="A safe and flexible file-system backup and deployment tool"
arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ url="http://www.fsarchiver.org/"
license=('GPL2')
depends=('bzip2' 'e2fsprogs' 'lzo2' 'xz' 'libgcrypt')
source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('2844a2c8c08181148ee5e05d03b781030b2b67f4')
+sha1sums=('3b1049b674f3be45ecda5a91a584c7ddc3781e6b')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/glu/PKGBUILD b/extra/glu/PKGBUILD
index a3905a97e..338df82e9 100644
--- a/extra/glu/PKGBUILD
+++ b/extra/glu/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD 168550 2012-10-13 11:42:49Z andyrtr $
+# $Id: PKGBUILD 178743 2013-02-26 16:19:48Z andyrtr $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
# Contributor: Laurent Carlier <lordheavym@gmail.com>
pkgname=glu
pkgver=9.0.0
-pkgrel=1
+pkgrel=2
pkgdesc="Mesa OpenGL Utility library"
arch=('i686' 'x86_64')
url="http://cgit.freedesktop.org/mesa/glu/"
license=('LGPL')
depends=('libgl')
-makedepends=('mesa')
options=('!libtool')
source=(ftp://ftp.freedesktop.org/pub/mesa/$pkgname/$pkgname-$pkgver.tar.bz2)
sha256sums=('1f7ad0d379a722fcbd303aa5650c6d7d5544fde83196b42a73d1193568a4df12')
diff --git a/extra/libpng/PKGBUILD b/extra/libpng/PKGBUILD
index cf7b93bd6..7e6d62bde 100644
--- a/extra/libpng/PKGBUILD
+++ b/extra/libpng/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 169446 2012-10-21 10:49:41Z ibiru $
+# $Id: PKGBUILD 178758 2013-02-26 18:11:18Z ioni $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: dorphell <dorphell@archlinux.org>
# Contributor: Travis Willard <travis@archlinux.org>
# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
pkgname=libpng
-pkgver=1.5.13
-_apngver=1.5.13
+pkgver=1.5.14
+_apngver=1.5.14
pkgrel=1
pkgdesc="A collection of routines used to create PNG format graphics files"
arch=('i686' 'x86_64')
@@ -16,8 +16,8 @@ depends=('zlib' 'sh')
options=('!libtool')
source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.xz"
"http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-$_apngver-apng.patch.gz")
-md5sums=('0b607a685da977f1bfc96e1c47055183'
- '23c8765aa6ca188c0575386d5ea8fe70')
+md5sums=('94284b01d62ca43c5eb3f6702db08ed8'
+ '89fbc11f19ec1f181587bdde1dd9402f')
build() {
cd $pkgname-$pkgver
diff --git a/extra/libtorrent-rasterbar/PKGBUILD b/extra/libtorrent-rasterbar/PKGBUILD
index 3299ac897..99be3512f 100644
--- a/extra/libtorrent-rasterbar/PKGBUILD
+++ b/extra/libtorrent-rasterbar/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 176291 2013-01-28 16:48:24Z stephane $
+# $Id: PKGBUILD 178762 2013-02-26 18:22:51Z ioni $
# Maintainer : Ionut Biru <ibiru@archlinux.org>
# Contributor: Hugo Doria <hugo@archlinux.org>
pkgname=libtorrent-rasterbar
-pkgver=0.16.7
-pkgrel=2
+pkgver=0.16.8
+pkgrel=1
epoch=1
pkgdesc="A C++ library that aims to be a good alternative to all the other bittorrent implementations around"
url="http://www.rasterbar.com/products/libtorrent/"
@@ -14,7 +14,7 @@ depends=('boost-libs' 'geoip' 'python2')
makedepends=('boost')
options=('!libtool' '!emptydirs')
source=(http://libtorrent.googlecode.com/files/$pkgname-$pkgver.tar.gz)
-sha1sums=('94b132a17d8f6a5345937731343398be8d31f170')
+sha1sums=('483689787cb64e7cf4abefda4058b912ec406709')
build() {
cd $pkgname-$pkgver
diff --git a/extra/mtr/PKGBUILD b/extra/mtr/PKGBUILD
index e07e9a946..5e29706a8 100644
--- a/extra/mtr/PKGBUILD
+++ b/extra/mtr/PKGBUILD
@@ -1,33 +1,38 @@
-# $Id: PKGBUILD 144089 2011-12-03 12:24:56Z ibiru $
+# $Id: PKGBUILD 178764 2013-02-26 18:56:25Z ioni $
# Maintainer : Ionut Biru <ibiru@archlinux.org>
# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
pkgbase=mtr
pkgname=(mtr mtr-gtk)
-pkgver=0.82
+pkgver=0.83
pkgrel=1
arch=('i686' 'x86_64')
license=('GPL')
makedepends=('ncurses' 'gtk2')
-source=(ftp://ftp.bitwizard.nl/mtr/$pkgbase-$pkgver.tar.gz)
+source=(ftp://ftp.bitwizard.nl/mtr/$pkgbase-$pkgver.tar.gz
+ mtr-glib2.patch)
url="http://www.bitwizard.nl/mtr/"
-md5sums=('10601ea543fda3e51545c4bce195b64c')
+md5sums=('2e3a40f2da47748ad0053a5d678b9b4a'
+ '6bce08e1de7c6835bdda893847981bc8')
build() {
- install -d "$srcdir/"{mtr-cli,mtr-gtk}
- cd "$srcdir/mtr-cli"
- ../$pkgbase-$pkgver/configure --prefix=/usr --disable-gtktest --without-gtk
+ patch -Np0 -i mtr-glib2.patch
+ cp -r $pkgbase-$pkgver $pkgbase-cli
+ cd mtr-cli
+ ./bootstrap.sh
+ ./configure --prefix=/usr --without-gtk
make
- cd "$srcdir/mtr-gtk"
- ../$pkgbase-$pkgver/configure --prefix=/usr
+ cd "$srcdir/$pkgbase-$pkgver"
+ ./bootstrap.sh
+ ./configure --prefix=/usr
make
}
package_mtr() {
pkgdesc="Combines the functionality of traceroute and ping into one tool (CLI version)"
- depends=('ncurses')
- cd "$srcdir/mtr-cli"
+ depends=('ncurses' 'glib2')
+ cd mtr-cli
make DESTDIR="$pkgdir" install
}
@@ -37,6 +42,6 @@ package_mtr-gtk() {
conflicts=("mtr")
provides=("mtr=$pkgver")
- cd "$srcdir/mtr-gtk"
+ cd $pkgbase-$pkgver
make DESTDIR="$pkgdir" install
}
diff --git a/extra/mtr/mtr-glib2.patch b/extra/mtr/mtr-glib2.patch
new file mode 100644
index 000000000..76a53fa6f
--- /dev/null
+++ b/extra/mtr/mtr-glib2.patch
@@ -0,0 +1,26 @@
+diff -up mtr-0.83/configure.in.glib2 mtr-0.83/configure.in
+--- mtr-0.83/configure.in.glib2 2013-02-18 20:10:00.767417356 +0100
++++ mtr-0.83/configure.in 2013-02-18 20:10:53.549513018 +0100
+@@ -59,6 +59,8 @@ else
+ GTK_OBJ=""
+ fi
+
++PKG_CHECK_MODULES([GLIB2], [glib-2.0])
++
+ AC_CHECK_FUNC(socket, ,
+ AC_CHECK_LIB(socket, socket, , AC_MSG_ERROR(No socket library found)))
+
+diff -up mtr-0.83/Makefile.am.glib2 mtr-0.83/Makefile.am
+--- mtr-0.83/Makefile.am.glib2 2013-02-18 20:13:54.635841512 +0100
++++ mtr-0.83/Makefile.am 2013-02-18 20:16:17.877101679 +0100
+@@ -19,8 +19,9 @@ mtr_SOURCES = mtr.c \
+ mtr-gtk.h
+ EXTRA_mtr_SOURCES = curses.c \
+ gtk.c
++AM_CFLAGS = $(GLIB2_CFLAGS)
+ mtr_DEPENDENCIES = $(GTK_OBJ) $(CURSES_OBJ)
+-mtr_LDFLAGS = $(GTK_OBJ) $(CURSES_OBJ)
++mtr_LDFLAGS = $(GTK_OBJ) $(GLIB2_LIBS) $(CURSES_OBJ)
+
+ EXTRA_DIST = SECURITY mtr.8 Makefile Makefile.dist
+ distclean-local:
diff --git a/extra/nspr/PKGBUILD b/extra/nspr/PKGBUILD
index 1f427a23f..07dc4d298 100644
--- a/extra/nspr/PKGBUILD
+++ b/extra/nspr/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 173931 2012-12-28 07:40:52Z andyrtr $
+# $Id: PKGBUILD 178768 2013-02-26 20:04:47Z ioni $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Alexander Baldeck <alexander@archlinux.org>
pkgname=nspr
-pkgver=4.9.4
+pkgver=4.9.5
pkgrel=1
pkgdesc="Netscape Portable Runtime"
arch=(i686 x86_64)
@@ -13,7 +13,7 @@ makedepends=('zip')
options=(!emptydirs)
source=(ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${pkgver}/src/${pkgname}-${pkgver}.tar.gz
nspr.pc.in)
-md5sums=('cf58772702b3abbdcff14e22014eeeaf'
+md5sums=('b6ccfa8fcbbeb17ebeb19a3edff612bd'
'bce1611f3117b53fc904cab549c09967')
build() {
diff --git a/extra/nss/PKGBUILD b/extra/nss/PKGBUILD
index 07ced92db..d4540f420 100644
--- a/extra/nss/PKGBUILD
+++ b/extra/nss/PKGBUILD
@@ -1,32 +1,30 @@
-# $Id: PKGBUILD 174760 2013-01-06 20:10:23Z jgc $
+# $Id: PKGBUILD 178767 2013-02-26 20:04:18Z ioni $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=nss
-pkgver=3.14.1.1.93
-_pkgver=3.14.1
+pkgver=3.14.3
pkgrel=1
pkgdesc="Mozilla Network Security Services"
arch=(i686 x86_64)
url="http://www.mozilla.org/projects/security/pki/nss/"
license=('MPL' 'GPL')
-_nsprver=4.9.4
+_nsprver=4.9.5
depends=("nspr>=${_nsprver}" 'sqlite' 'zlib' 'sh')
makedepends=('perl')
options=('!strip')
-#source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgname}-${pkgver}.tar.gz
-source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_3_14_1_WITH_CKBI_1_93_RTM/src/${pkgname}-3.14.1.with.ckbi.1.93.tar.gz
+source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgname}-${pkgver}.tar.gz
nss.pc.in
nss-config.in
ssl-renegotiate-transitional.patch
add_spi+cacert_ca_certs.patch)
-sha1sums=('28b4a2316dc5e5d4605ac375449691c05b6f1c29'
+sha1sums=('94d8781d1fa29cfbd37453dda3e9488709b82c4c'
'aa5b2c0aa38d3c1066d511336cf28d1333e3aebd'
'cb744cc3e56b604e4754bc3c7d9f25bb9a0a136c'
'8a964a744ba098711b80c0d279a2993524e8eb92'
'be6ef0f124f188ebb76f4d83e13466bdcfb27dd3')
build() {
- cd "${srcdir}/${pkgname}-${_pkgver}/mozilla"
+ cd "${srcdir}/${pkgname}-${pkgver}/mozilla"
# Add CAcert and spi-inc.org CA certificates.
# See http://wiki.cacert.org/NSSLib for how to generate
patch -Np0 -i "${srcdir}/add_spi+cacert_ca_certs.patch"
@@ -47,7 +45,7 @@ build() {
# cd security/nss/lib/ckfw/builtins
# make generate
- cd "${srcdir}/${pkgname}-${_pkgver}"
+ cd "${srcdir}/${pkgname}-${pkgver}"
export BUILD_OPT=1
export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
@@ -65,7 +63,7 @@ build() {
}
package() {
- cd "${srcdir}/${pkgname}-${_pkgver}"
+ cd "${srcdir}/${pkgname}-${pkgver}"
install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
install -m755 -d "${pkgdir}/usr/bin"
install -m755 -d "${pkgdir}/usr/include/nss"
diff --git a/extra/sane/PKGBUILD b/extra/sane/PKGBUILD
index 4abdfd248..d0aab1080 100644
--- a/extra/sane/PKGBUILD
+++ b/extra/sane/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 173127 2012-12-11 14:42:10Z jgc $
+# $Id: PKGBUILD 178746 2013-02-26 16:27:02Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
# Contributor: Simo L. <neotuli@yahoo.com>
@@ -6,7 +6,7 @@
pkgname=sane
pkgver=1.0.23
-pkgrel=2
+pkgrel=3
pkgdesc="Scanner Access Now Easy"
url="http://www.sane-project.org/"
arch=('i686' 'x86_64')
@@ -18,12 +18,19 @@ backup=(etc/sane.d/{abaton.conf,agfafocus.conf,apple.conf,artec.conf,artec_eplus
source=(ftp://ftp.archlinux.org/other/sane/$pkgname-backends-$pkgver.tar.gz
'sane.xinetd'
'saned.socket'
- 'saned.service')
+ 'saned.service'
+ 'kodakaio.c.patch'
+ 'network.patch')
options=(!libtool)
build() {
cd "${srcdir}/${pkgname}-backends-${pkgver}"
+ # fix FS#33657
+ patch -Np0 -i ${srcdir}/kodakaio.c.patch
+ # fix http://vasks.debian.org/tracker/?func=detail&atid=410366&aid=313760&group_id=30186
+ patch -Np1 -i ${srcdir}/network.patch
+
./configure --prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
@@ -59,6 +66,8 @@ package () {
"${pkgdir}/usr/lib/systemd/system/saned@.service"
}
md5sums=('e226a89c54173efea80e91e9a5eb6573'
- 'da946cc36fb83612162cf9505986d4b2'
+ '5f519030392d599e2ad348159ec4c96f'
'e57e9e15528f47f5f1b3f1411135ed5d'
- 'e44bd4c994a52d6f472463d1eb0a03be')
+ 'e44bd4c994a52d6f472463d1eb0a03be'
+ 'e65dbefb7c3d69955fb6eb3ace14aa12'
+ '44e77692c52db15b0f530a1d9a8e1296')
diff --git a/extra/sane/kodakaio.c.patch b/extra/sane/kodakaio.c.patch
new file mode 100644
index 000000000..95cb1ee9a
--- /dev/null
+++ b/extra/sane/kodakaio.c.patch
@@ -0,0 +1,11 @@
+--- backend/kodakaio.c.bad 2013-01-31 20:42:10.627296894 +0100
++++ backend/kodakaio.c 2013-01-31 20:42:46.040397213 +0100
+@@ -2197,7 +2197,7 @@
+
+ reply = cupsGetDevices(CUPS_HTTP_DEFAULT, CUPS_TIMEOUT_DEFAULT,
+ "dnssd", CUPS_EXCLUDE_NONE, ProcessDevice, Dummy);
+- if(reply != IPP_OK) printf("Failed cupsGetDevices\n");
++ if(reply != IPP_OK) DBG(1, "Failed cupsGetDevices\n");
+
+ return 0;
+ }
diff --git a/extra/sane/libv4l-0.8.3.patch b/extra/sane/libv4l-0.8.3.patch
deleted file mode 100644
index 4e240e0cf..000000000
--- a/extra/sane/libv4l-0.8.3.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 26c69b228b29f612faf4b0cc85db969ee7cc4ea6 Mon Sep 17 00:00:00 2001
-From: Nils Philippsen <nils@redhat.com>
-Date: Mon, 14 Mar 2011 13:35:05 +0100
-Subject: [PATCH] patch: v4l
-
-Squashed commit of the following:
-
-commit 23381932c76846191b42a48e505b37cd74711265
-Author: Julien BLACHE <jb@jblache.org>
-Date: Wed Feb 16 19:37:43 2011 +0100
-
- Fix v4l build with libv4l 0.8.3+
-
- (cherry picked from commit c5ca46c2d1be78c651afb843cc834cf2b5b24953)
-
- Conflicts:
-
- ChangeLog
-
- Signed-off-by: Nils Philippsen <nils@redhat.com>
----
- backend/v4l.c | 3 +--
- backend/v4l.h | 3 ++-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/backend/v4l.c b/backend/v4l.c
-index 6510ef0..38595ed 100644
---- a/backend/v4l.c
-+++ b/backend/v4l.c
-@@ -84,9 +84,8 @@
- #include "../include/sane/sanei_config.h"
- #define V4L_CONFIG_FILE "v4l.conf"
-
--#include "v4l.h"
--
- #include <libv4l1.h>
-+#include "v4l.h"
-
- static const SANE_Device **devlist = NULL;
- static int num_devices;
-diff --git a/backend/v4l.h b/backend/v4l.h
-index 588b96e..6aee586 100644
---- a/backend/v4l.h
-+++ b/backend/v4l.h
-@@ -29,6 +29,7 @@
- #ifndef v4l_h
- #define v4l_h
-
-+#ifndef __LINUX_VIDEODEV_H
- /* Kernel interface */
- /* Only the stuff we need. For more features, more defines are needed */
-
-@@ -165,7 +166,7 @@ struct video_channel
-
-
- /* end of kernel interface */
--
-+#endif /* !__LINUX_VIDEODEV_H */
-
- #include <../include/sane/sane.h>
-
---
-1.7.4
-
diff --git a/extra/sane/network.patch b/extra/sane/network.patch
new file mode 100644
index 000000000..2605ea835
--- /dev/null
+++ b/extra/sane/network.patch
@@ -0,0 +1,42 @@
+diff --git a/sanei/sanei_tcp.c b/sanei/sanei_tcp.c
+index a57d7c7..d0a1e92 100644
+--- a/sanei/sanei_tcp.c
++++ b/sanei/sanei_tcp.c
+@@ -45,6 +45,7 @@
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <time.h>
+
+ #ifdef HAVE_WINSOCK2_H
+ #include <winsock2.h>
+@@ -123,14 +124,27 @@ sanei_tcp_write(int fd, const u_char * buf, int count)
+ ssize_t
+ sanei_tcp_read(int fd, u_char * buf, int count)
+ {
+- ssize_t bytes_recv = 0, rc = 1;
++ ssize_t bytes_recv = 0, rc = 1;
++ int retry = 5;
+
+ while (bytes_recv < count && rc > 0)
+ {
+ rc = recv(fd, buf+bytes_recv, count-bytes_recv, 0);
++ DBG(1, "%s: bytes received %d\n", __FUNCTION__, rc);
+ if (rc > 0)
+ bytes_recv += rc;
+-
++ else {
++ if ( errno == EAGAIN && retry-- ) {
++ DBG(1, "%s: waiting %d\n", __FUNCTION__, retry);
++ /* wait for max 1s */
++ struct timespec req;
++ struct timespec rem;
++ req.tv_sec = 0;
++ req.tv_nsec= 100000000;
++ nanosleep(&req, &rem);
++ rc = 1;
++ }
++ }
+ }
+ return bytes_recv;
+ }
diff --git a/extra/sane/sane.xinetd b/extra/sane/sane.xinetd
index b035664b4..67f08a656 100644
--- a/extra/sane/sane.xinetd
+++ b/extra/sane/sane.xinetd
@@ -3,7 +3,7 @@ service sane-port
port = 6566
socket_type = stream
wait = no
- user = root
+ user = nobody
group = scanner
server = /usr/sbin/saned
# disabled by default!
diff --git a/extra/sane/xerox_mfp_fix_usb_devices.patch b/extra/sane/xerox_mfp_fix_usb_devices.patch
deleted file mode 100644
index 5ed29b974..000000000
--- a/extra/sane/xerox_mfp_fix_usb_devices.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-commit 5ea227caeacd504b64eef301e83fa63e0a25b3f7
-Author: Alex Belkin <abc@telekom.ru>
-Date: Tue Mar 8 17:57:19 2011 +0300
-
- keep usb device by default (correct for bug introduced by tcp sub-backend
-
-diff --git a/backend/xerox_mfp.c b/backend/xerox_mfp.c
-index e08b50f..d4672a7 100644
---- a/backend/xerox_mfp.c
-+++ b/backend/xerox_mfp.c
-@@ -37,10 +37,10 @@
- static const SANE_Device **devlist = NULL; /* sane_get_devices array */
- static struct device *devices_head = NULL; /* sane_get_devices list */
-
--transport available_transports[] = {
-+enum { TRANSPORT_USB, TRANSPORT_TCP, TRANSPORTS_MAX };
-+transport available_transports[TRANSPORTS_MAX] = {
- { "usb", usb_dev_request, usb_dev_open, usb_dev_close, usb_configure_device },
- { "tcp", tcp_dev_request, tcp_dev_open, tcp_dev_close, tcp_configure_device },
-- { 0 }
- };
-
- static int resolv_state(int state)
-@@ -824,7 +824,13 @@ free_devices (void)
- devices_head = NULL;
- }
-
--/* SANE API ignores return code of this callback */
-+static transport *tr_from_devname(SANE_String_Const devname)
-+{
-+ if (strncmp("tcp", devname, 3) == 0)
-+ return &available_transports[TRANSPORT_TCP];
-+ return &available_transports[TRANSPORT_USB];
-+}
-+
- static SANE_Status
- list_one_device (SANE_String_Const devname)
- {
-@@ -839,12 +845,7 @@ list_one_device (SANE_String_Const devname)
- return SANE_STATUS_GOOD;
- }
-
-- for (tr = available_transports; tr->ttype; tr++) {
-- if (!strncmp (devname, tr->ttype, strlen(tr->ttype)))
-- break;
-- }
-- if (!tr->ttype)
-- return SANE_STATUS_INVAL;
-+ tr = tr_from_devname(devname);
-
- dev = calloc (1, sizeof (struct device));
- if (dev == NULL)
-@@ -878,13 +879,7 @@ list_one_device (SANE_String_Const devname)
- static SANE_Status
- list_conf_devices (UNUSED (SANEI_Config * config), const char *devname)
- {
-- transport *tr;
--
-- for (tr = available_transports; tr->ttype; tr++) {
-- if (!strncmp (devname, tr->ttype, strlen(tr->ttype)))
-- return tr->configure_device(devname, list_one_device);
-- }
-- return SANE_STATUS_INVAL;
-+ return tr_from_devname(devname)->configure_device(devname, list_one_device);
- }
-
- SANE_Status
diff --git a/extra/swt/PKGBUILD b/extra/swt/PKGBUILD
index 94c7bc9ec..117266eec 100644
--- a/extra/swt/PKGBUILD
+++ b/extra/swt/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 173193 2012-12-12 16:57:29Z guillaume $
+# $Id: PKGBUILD 178694 2013-02-26 10:20:09Z guillaume $
# Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
pkgname=swt
pkgver=4.2.1
-pkgrel=1
+pkgrel=2
_date=201209141800
-pkgdesc="An open source widget toolkit for Java"
+pkgdesc='An open source widget toolkit for Java'
arch=('i686' 'x86_64')
-url="http://www.eclipse.org/swt/"
+url='http://www.eclipse.org/swt/'
license=('EPL')
depends=('java-runtime>=6' 'gtk2>=2.20.1' 'libxtst')
optdepends=('libgnomeui' 'mesa' 'glu' 'libwebkit')
@@ -25,6 +25,7 @@ source=(http://download.eclipse.org/eclipse/downloads/drops4/R-${pkgver}-${_date
build-swt.xml)
# To test this pkg:
# http://www.eclipse.org/swt/examples.php#standaloneOutsideEclipse
+# http://download.eclipse.org/eclipse/downloads/
build() {
cd ${srcdir}
diff --git a/extra/tomcat-native/PKGBUILD b/extra/tomcat-native/PKGBUILD
index 277778cfc..22e7cd0bc 100644
--- a/extra/tomcat-native/PKGBUILD
+++ b/extra/tomcat-native/PKGBUILD
@@ -2,16 +2,17 @@
# Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua
pkgname=tomcat-native
-pkgver=1.1.24
+pkgver=1.1.27
pkgrel=1
-pkgdesc="The Apache Tomcat Native Library"
+pkgdesc='The Apache Tomcat Native Library'
arch=('i686' 'x86_64')
-url="http://tomcat.apache.org/"
-license=("Apache")
+url='http://tomcat.apache.org/'
+license=('APACHE')
depends=('apr' 'openssl')
makedepends=('java-environment')
+options=(!emptydirs)
source=(http://www.apache.org/dist/tomcat/tomcat-connectors/native/${pkgver}/source/${pkgname}-${pkgver}-src.tar.gz)
-md5sums=('cfd4762f2da19ba79d1b6a2a948c9d21')
+sha256sums=('7f78e71060dc029f9005490080babc45a2b702ea54263c440c52a9a7c02609e4')
build() {
cd "${srcdir}/tomcat-native-${pkgver}-src/jni/native"
@@ -28,5 +29,4 @@ package() {
cd "${srcdir}/${pkgname}-${pkgver}-src/jni/native"
make DESTDIR=${pkgdir} install
- rm -rf ${pkgdir}/usr/{bin,include}
}
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-22 16:26:45 +0000