Merge branch 'HEAD' of ssh://jams@knoppmyth.net/mount/repository/LinHES-PKGBUILD

4 files changed, 38 insertions, 6 deletions

diff --git a/abs/core-testing/libjpeg6/PKGBUILD b/abs/core-testing/libjpeg6/PKGBUILD
index 285532e..a66b92e 100644
--- a/abs/core-testing/libjpeg6/PKGBUILD
+++ b/abs/core-testing/libjpeg6/PKGBUILD
@@ -3,7 +3,7 @@
 # Committer: Judd Vinet <jvinet@zeroflux.org>
 pkgname=libjpeg6
 pkgver=6b
-pkgrel=8
+pkgrel=9
 pkgdesc="Library of JPEG support functions"
 arch=('i686' 'x86_64')
 url="http://ijg.org"
@@ -11,6 +11,7 @@ license=('custom')
 depends=('glibc')
 makedepends=('libtool')
 options=(!libtool)
+install=libjpeg6.install
 source=(ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v$pkgver.tar.gz)
 md5sums=('dbd5f3b47ed13132f04c685d608a7547')
 
diff --git a/abs/core-testing/libjpeg6/libjpeg6.install b/abs/core-testing/libjpeg6/libjpeg6.install
new file mode 100644
index 0000000..dfb8ede
--- /dev/null
+++ b/abs/core-testing/libjpeg6/libjpeg6.install
@@ -0,0 +1,31 @@
+# arg 1:  the new package version
+post_install() {
+	if qrep -q libjpeg6 /etc/ld.so.conf
+	then
+		exit
+	else
+		echo "/opt/libjpeg6/include" >> /etc/ld.so.conf
+		ldconfig
+	fi
+}
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_upgrade() {
+	if qrep -q libjpeg6 /etc/ld.so.conf
+	then
+		exit
+	else
+		echo "/opt/libjpeg6/include" >> /etc/ld.so.conf
+		ldconfig
+	fi
+}
+# arg 1:  the old package version
+post_remove() {
+	grep -v libjpeg6 /etc/ld.so.conf > /tmp/ld.so.conf
+	mv /tmp/ld.so.conf /etc/ld.so.conf
+	ldconfig
+}
+
+op=$1
+shift
+$op $*
diff --git a/abs/core-testing/mythtv/stable/mytharchive/PKGBUILD b/abs/core-testing/mythtv/stable/mytharchive/PKGBUILD
index f5c51f2..4862a1f 100644
--- a/abs/core-testing/mythtv/stable/mytharchive/PKGBUILD
+++ b/abs/core-testing/mythtv/stable/mytharchive/PKGBUILD
@@ -4,12 +4,12 @@
 
 pkgname=mytharchive
 pkgver=0.21
-pkgrel=9
+pkgrel=10
 pkgdesc="MythTV plugin that lets you create DVDs from or archive your recorded shows."
 arch=('i686' 'x86_64')
 url="http://www.mythtv.org"
 license=('GPL')
-depends=("mythtv>=${pkgver}" 'libxmu' 'mysql-python' 'pil' 'dvdauthor' 'mjpegtools' 'transcode')
+depends=("mythtv>=${pkgver}" 'libxmu' 'libjpeg6' 'mysql-python' 'pil' 'dvdauthor' 'mjpegtools' 'transcode')
 source=("ftp://ftp.knoppmyth.net/R6/sources/mythplugins-$pkgver-fixes.tar.bz2")
 md5sums=('1b3e2a97b7ecf7373e162fe20b6faabe')
 groups=('mythtv-extras')
diff --git a/abs/core-testing/pil/PKGBUILD b/abs/core-testing/pil/PKGBUILD
index f16214a..5ae42bb 100644
--- a/abs/core-testing/pil/PKGBUILD
+++ b/abs/core-testing/pil/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=pil
 pkgver=1.1.6
-pkgrel=9
+pkgrel=11
 pkgdesc="Python imaging library"
 arch=('i686' 'x86_64')
 url="http://www.pythonware.com/products/pil/index.htm"
@@ -16,8 +16,8 @@ md5sums=('3a9b5c20ca52f0a9900512d2c7347622')
 
 build() {
   cd $srcdir/Imaging-$pkgver
-  sed -i "s#JPEG_ROOT\ =\ None#JPEG_ROOT\ =\ \"/opt/libjpeg6\"#" setup.py
-  python setup.py build_ext 
+  sed -i "s#JPEG_ROOT\ =\ None#JPEG_ROOT\ =\ \"/opt/libjpeg6/lib\",\ \"/opt/libjpeg6/include\"#" setup.py
+  python setup.py build_ext -i
   python setup.py install --root=$pkgdir
   mkdir -p $pkgdir/usr/include/python2.6/
   cp libImaging/*.h $pkgdir/usr/include/python2.6/