summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Meyer <james.meyer@operamail.com>2009-10-04 20:50:12 (GMT)
committerJames Meyer <james.meyer@operamail.com>2009-10-04 20:50:12 (GMT)
commit5e0e569c89785e86e7a2cb0f2a309c48498dfb69 (patch)
tree8816e88a33cf241c7eb96bb6514c72db6f1daec9
parentefa2ca9d8996501746d07bdeffcd7d5d4f56c838 (diff)
downloadlinhes_pkgbuild-5e0e569c89785e86e7a2cb0f2a309c48498dfb69.zip
linhes_pkgbuild-5e0e569c89785e86e7a2cb0f2a309c48498dfb69.tar.gz
linhes_pkgbuild-5e0e569c89785e86e7a2cb0f2a309c48498dfb69.tar.bz2
mjpeg_tools: link against libjpeg6
-rw-r--r--abs/core-testing/mjpegtools/PKGBUILD8
-rw-r--r--abs/core-testing/mjpegtools/__changelog2
2 files changed, 6 insertions, 4 deletions
diff --git a/abs/core-testing/mjpegtools/PKGBUILD b/abs/core-testing/mjpegtools/PKGBUILD
index 06c086a..8970aad 100644
--- a/abs/core-testing/mjpegtools/PKGBUILD
+++ b/abs/core-testing/mjpegtools/PKGBUILD
@@ -4,13 +4,13 @@
pkgname=mjpegtools
pkgver=1.9.0
-pkgrel=6
+pkgrel=8
pkgdesc="The mjpeg programs are a set of tools that can do recording of videos and playback, simple cut-and-paste editing and the MPEG compression of audio and video under Linux. "
arch=(i686 x86_64)
license=('GPL')
url="http://mjpeg.sourceforge.net/"
-depends=('libjpeg' 'libpng' 'sdl' 'gcc' 'libdv')
-makedepends=('gtk2')
+depends=('libpng' 'sdl' 'gcc' 'libdv' 'libjpeg6')
+makedepends=('gtk2' 'libjpeg6')
options=('!makeflags' '!libtool')
source=(http://downloads.sourceforge.net/sourceforge/mjpeg/${pkgname}-${pkgver}.tar.gz
mjpegtools-1.8.0-gcc41.patch)
@@ -18,7 +18,7 @@ source=(http://downloads.sourceforge.net/sourceforge/mjpeg/${pkgname}-${pkgver}.
build() {
cd ${startdir}/src/${pkgname}-${pkgver}
# patch -Np1 -i ${startdir}/src/mjpegtools-1.8.0-gcc41.patch || return 1
- ./configure --prefix=/usr
+env CPPFLAGS="-I/opt/libjpeg6/include" LDFLAGS="-L/opt/libjpeg6/lib" ./configure --prefix=/usr --enable-static-build
find -name Makefile -exec sed -i -e 's:-march=k8 -mtune=k8::' -e 's:-march=pentium3 -mtune=pentium3::' {} \;
make || return 1
diff --git a/abs/core-testing/mjpegtools/__changelog b/abs/core-testing/mjpegtools/__changelog
new file mode 100644
index 0000000..aa74d17
--- /dev/null
+++ b/abs/core-testing/mjpegtools/__changelog
@@ -0,0 +1,2 @@
+change to build against libjpeg6
+ env CPPFLAGS="-I/opt/libjpeg6/include" LDFLAGS="-L/opt/libjpeg6/lib" ./configure -