2.2.4-1: Upstream update

3 files changed, 9 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0c3fdc2b2a3d..0e973bc2e600 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Sun May 22 15:49:28 UTC 2016
 pkgbase = lib32-libdc1394
 	pkgdesc = High level programming interface to control IEEE 1394 based cameras (32 bit)
-	pkgver = 2.2.3
+	pkgver = 2.2.4
 	pkgrel = 1
 	url = http://sourceforge.net/projects/libdc1394/
 	arch = x86_64
@@ -10,10 +12,8 @@ pkgbase = lib32-libdc1394
 	depends = lib32-libusb
 	depends = libdc1394
 	options = !emptydirs
-	source = http://downloads.sourceforge.net/libdc1394/libdc1394-2.2.3.tar.gz
-	source = sdl-config-32.patch
-	md5sums = 443d0638e51054ff37fb8e551e07672a
-	md5sums = c17d80af8323d82fbc9a4993b758d4ab
+	source = http://downloads.sourceforge.net/libdc1394/libdc1394-2.2.4.tar.gz
+	md5sums = 620eb745d64b714c6009f3e6f2ba33ec
 
 pkgname = lib32-libdc1394
 
diff --git a/PKGBUILD b/PKGBUILD
index cef5d269be8f..6d3012266696 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 _pkgname=libdc1394
 pkgname=lib32-${_pkgname}
-pkgver=2.2.3
+pkgver=2.2.4
 pkgrel=1
 pkgdesc="High level programming interface to control IEEE 1394 based cameras (32 bit)"
 arch=('x86_64')
@@ -12,18 +12,8 @@ url="http://sourceforge.net/projects/libdc1394/"
 depends=('lib32-libraw1394' 'lib32-libusb' "${_pkgname}")
 makedepends=('gcc-multilib')
 options=('!emptydirs')
-source=("http://downloads.sourceforge.net/${_pkgname}/${_pkgname}-${pkgver}.tar.gz"
-        'sdl-config-32.patch')
-md5sums=('443d0638e51054ff37fb8e551e07672a'
-         'c17d80af8323d82fbc9a4993b758d4ab')
-
-prepare() {
-
-# This might be redundant and overkill
-cd ${_pkgname}-${pkgver}
-patch -Np2 < ../sdl-config-32.patch
-
-}
+source=("http://downloads.sourceforge.net/${_pkgname}/${_pkgname}-${pkgver}.tar.gz")
+md5sums=('620eb745d64b714c6009f3e6f2ba33ec')
 
 build() {
 export CC='gcc -m32'
@@ -32,8 +22,8 @@ export LDFLAGS='-m32'
 #SDL_CFLAGS = -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
 export SDL_CONFIG='/usr/bin/sdl-config-32'
 export SDL_LIBS='-L/usr/lib32 -lSDL -lpthread'
-
 export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
+
 cd ${_pkgname}-${pkgver}
 ./configure --prefix=/usr --libdir=/usr/lib32
 make
diff --git a/sdl-config-32.patch b/sdl-config-32.patch
deleted file mode 100644
index d743e7c3ecc2..000000000000
--- a/sdl-config-32.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/libdc1394-2.2.1/configure	2013-01-28 11:47:43.000000000 +0900
-+++ src/libdc1394-2.2.1/configure	2015-01-12 02:10:24.646720866 +0900
-@@ -13322,13 +13322,13 @@
-   if test x$sdl_exec_prefix != x ; then
-     sdl_config_args="$sdl_config_args --exec-prefix=$sdl_exec_prefix"
-     if test x${SDL_CONFIG+set} != xset ; then
--      SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
-+      SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config-32
-     fi
-   fi
-   if test x$sdl_prefix != x ; then
-     sdl_config_args="$sdl_config_args --prefix=$sdl_prefix"
-     if test x${SDL_CONFIG+set} != xset ; then
--      SDL_CONFIG=$sdl_prefix/bin/sdl-config
-+      SDL_CONFIG=$sdl_prefix/bin/sdl-config-32
-     fi
-   fi
-