xine-ui:bumped to latest.

7 files changed, 160 insertions, 19 deletions

diff --git a/abs/extra/xine-ui/ChangeLog b/abs/extra/xine-ui/ChangeLog
index e5fb3e8..bfb45aa 100644
--- a/abs/extra/xine-ui/ChangeLog
+++ b/abs/extra/xine-ui/ChangeLog
@@ -1,3 +1,23 @@
+2010-03-23  Eric Belanger  <eric@archlinux.org>
+
+	* xine-ui 0.99.6-1
+	* Upstream update
+	* Cleaned up depends
+	* Removed optdepends
+	* Replaced lirc makedepends by lirc-utils
+	* Added shared-mime-info depends
+
+2010-01-19  Eric Belanger  <eric@archlinux.org>
+
+	* xine-ui 0.99.5-6
+	* Rebuilt for libpng 1.4 and libjpeg 8
+	* Added install scriptlet to update icon cache
+
+2009-06-18  Eric Belanger  <eric@archlinux.org>
+
+	* xine-ui 0.99.5-5
+	* Rebuilt against readline 6.0.00
+
 2008-08-19  Eric Belanger  <eric@archlinux.org>
 
 	* xine-ui 0.99.5-4
diff --git a/abs/extra/xine-ui/PKGBUILD b/abs/extra/xine-ui/PKGBUILD
index 79ab3c3..4c5471f 100644
--- a/abs/extra/xine-ui/PKGBUILD
+++ b/abs/extra/xine-ui/PKGBUILD
@@ -1,30 +1,41 @@
-# $Id: PKGBUILD 9858 2008-08-19 23:56:23Z eric $
+# $Id: PKGBUILD 77076 2010-04-10 16:09:26Z andrea $
 # Maintainer: Eric Belanger <eric@archlinux.org>
 
 pkgname=xine-ui
-pkgver=0.99.5
-pkgrel=4
+pkgver=0.99.6
+pkgrel=1
 pkgdesc="A free video player for Unix"
 arch=('i686' 'x86_64')
 license=('GPL')
-url="http://xinehq.de/"
-depends=('xine-lib' 'curl>=7.16.2' 'libxtst' 'libxinerama' 'libxv' 'libpng' 'libxft' 'libsm' 'libxxf86vm' 'ncurses>=5.6-7')
-makedepends=('lirc' 'libxt')
-optdepends=('lirc')
-options=('!emptydirs')
-source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.gz)
-md5sums=('e643cd1fcad4d98a5ae4eb877ce5087b')
+url="http://www.xine-project.org"
+depends=('xine-lib' 'curl' 'libxtst' 'libxinerama' 'libxv' 'libpng' 'libxft'
+	'libxxf86vm' 'readline' 'xdg-utils' 'shared-mime-info' 'hicolor-icon-theme'
+	'lirc-utils')
+makedepends=('libxt')
+options=('!emptydirs' '!strip')
+install=${pkgname}.install
+source=(http://downloads.sourceforge.net/xine/${pkgname}-${pkgver}.tar.xz
+	lirc-check-a89347673097.patch lirc-makefile-a68dd15ff7ae.patch fix_lirc.diff)
+md5sums=('d468b4e7fe39ff19888261e1da9be914'
+         '4f06f63f5fd55b08a648e5d63f881898'
+         '9f5acaf14f3945aa2ce428631d09cd47'
+         '0174bd096756b9c6f47e9b8b5ff6e145')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  
-  #add missing constant (defined in xine.h from xine-lib cvs)
-  echo '#define XINE_MSG_AUDIO_OUT_UNAVAILABLE 11' >> src/xitk/common.h
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 < "${srcdir}/lirc-check-a89347673097.patch" || return 1
+  patch -p1 < "${srcdir}/lirc-makefile-a68dd15ff7ae.patch" || return 1
+  patch -p1 < "${srcdir}/fix_lirc.diff" || return 1
+  autoconf || return 1
+
   ./configure --prefix=/usr --mandir=/usr/share/man \
-    --with-curses --with-x --enable-lirc --without-aalib
+    --with-x --enable-lirc --without-aalib --enable-debug || return 1
   make || return 1
-  make DESTDIR=${pkgdir} install
-  install -d ${pkgdir}/usr/share/applications
-  echo "Categories=Application;AudioVideo;" >> ${pkgdir}/usr/share/xine/desktop/xine.desktop
-  mv ${pkgdir}/usr/share/xine/desktop/xine.desktop ${pkgdir}/usr/share/applications
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install || return 1
+  install -d "${pkgdir}/usr/share/applications"
+  mv "${pkgdir}/usr/share/xine/desktop/xine.desktop" "${pkgdir}/usr/share/applications"
 }
diff --git a/abs/extra/xine-ui/fix_lirc.diff b/abs/extra/xine-ui/fix_lirc.diff
new file mode 100644
index 0000000..93890cb
--- /dev/null
+++ b/abs/extra/xine-ui/fix_lirc.diff
@@ -0,0 +1,13 @@
+diff --git a/m4/_xine.m4 b/m4/_xine.m4
+--- a/m4/_xine.m4
++++ b/m4/_xine.m4
+@@ -46,7 +46,8 @@ AC_DEFUN([AC_CHECK_LIRC],
+         fi
+         for llirc in $lirc_libprefix /lib /usr/lib /usr/local/lib; do
+           AC_CHECK_FILE(["$llirc/liblirc_client.so"],
+-             [LIRC_LIBS="$llirc/liblirc_client.so"]
++             [LIRC_LIBS="$llirc/liblirc_client.so"
++              found_lirc=yes]
+              AC_DEFINE([HAVE_LIRC],,[Define this if you have LIRC (liblirc_client) installed]),
+              AC_CHECK_FILE(["$llirc/liblirc_client.a"],
+                 [LIRC_LIBS="$llirc/liblirc_client.a"
diff --git a/abs/extra/xine-ui/lirc-check-a89347673097.patch b/abs/extra/xine-ui/lirc-check-a89347673097.patch
new file mode 100644
index 0000000..c1c8d26
--- /dev/null
+++ b/abs/extra/xine-ui/lirc-check-a89347673097.patch
@@ -0,0 +1,64 @@
+
+# HG changeset patch
+# User Darren Salt <linux@youmustbejoking.demon.co.uk>
+# Date 1268754560 0
+# Node ID a89347673097053d89675e991ab403cda04d94cd
+# Parent ed3079d668ed5291d1daf7096d6b42c90ee06e11
+Resync LIRC check with gxine; no longer fails if liblircclient0.pc is missing.
+
+--- a/m4/_xine.m4	Sun Mar 14 18:04:46 2010 +0000
++++ b/m4/_xine.m4	Tue Mar 16 15:49:20 2010 +0000
+@@ -25,14 +25,14 @@
+ dnl
+ AC_DEFUN([AC_CHECK_LIRC],
+   [AC_ARG_ENABLE(lirc,
+-     [  --disable-lirc          Turn off LIRC support.],
+-     [], enable_lirc=yes)
++     [AS_HELP_STRING([--disable-lirc], [turn off LIRC support])],
++     [given=Y], [given=N; enable_lirc=yes])
+ 
+   found_lirc=no
+   if test x"$enable_lirc" = xyes; then
+     have_lirc=yes
+-    PKG_CHECK_MODULES(LIRC, liblircclient0, [found_lirc=yes], [])
+-    if test "$LIRC_CFLAGS" != ''; then
++    PKG_CHECK_MODULES(LIRC, liblircclient0, [found_lirc=yes], [:])
++    if test "$found_lirc" = yes; then
+       LIRC_INCLUDE="$LIRC_CFLAGS"
+     else
+      AC_REQUIRE_CPP
+@@ -42,15 +42,20 @@
+ 
+         if test x"$LIRC_PREFIX" != "x"; then
+            lirc_libprefix="$LIRC_PREFIX/lib"
+-  	   LIRC_INCLUDE="-I$LIRC_PREFIX/include"
++	   LIRC_INCLUDE="-I$LIRC_PREFIX/include"
+         fi
+         for llirc in $lirc_libprefix /lib /usr/lib /usr/local/lib; do
+-          AC_CHECK_FILE(["$llirc/liblirc_client.a"],
+-            [LIRC_LIBS="$llirc/liblirc_client.a"
+-             found_lirc=yes],,)
++          AC_CHECK_FILE(["$llirc/liblirc_client.so"],
++             [LIRC_LIBS="$llirc/liblirc_client.so"]
++             AC_DEFINE([HAVE_LIRC],,[Define this if you have LIRC (liblirc_client) installed]),
++             AC_CHECK_FILE(["$llirc/liblirc_client.a"],
++                [LIRC_LIBS="$llirc/liblirc_client.a"
++                 found_lirc=yes],,)
++          )
+         done
+      else
+-         AC_MSG_RESULT([*** LIRC client support not available, LIRC support will be disabled ***]);
++	test $given = Y && AC_MSG_ERROR([LIRC client support requested but not available])
++	AC_MSG_RESULT([*** LIRC client support not available, LIRC support will be disabled ***])
+      fi
+     fi
+   fi
+@@ -59,7 +64,6 @@
+      fi
+      AC_SUBST(LIRC_LIBS)
+      AC_SUBST(LIRC_INCLUDE)
+-     AM_CONDITIONAL([HAVE_LIRC], [test "x$have_lirc" = "xyes"])
+ ])
+ 
+ dnl AC_C_ATTRIBUTE_ALIGNED
+
diff --git a/abs/extra/xine-ui/lirc-makefile-a68dd15ff7ae.patch b/abs/extra/xine-ui/lirc-makefile-a68dd15ff7ae.patch
new file mode 100644
index 0000000..daad4f0
--- /dev/null
+++ b/abs/extra/xine-ui/lirc-makefile-a68dd15ff7ae.patch
@@ -0,0 +1,19 @@
+
+# HG changeset patch
+# User Darren Salt <linux@youmustbejoking.demon.co.uk>
+# Date 1268758696 0
+# Node ID a68dd15ff7ae4be65c2ace25ef66966d7c272514
+# Parent 882c464d4a650d09da37ade366face74452c1897
+Restore definition of HAVE_LIRC for use in makefiles.
+
+--- a/m4/_xine.m4	Mon Mar 15 12:03:01 2010 -0700
++++ b/m4/_xine.m4	Tue Mar 16 16:58:16 2010 +0000
+@@ -62,6 +62,7 @@
+      if test "$found_lirc" = yes; then
+ 	AC_DEFINE([HAVE_LIRC],,[Define this if you have LIRC (liblirc_client) installed])
+      fi
++     AM_CONDITIONAL([HAVE_LIRC], [test "$found_lirc" = yes])
+      AC_SUBST(LIRC_LIBS)
+      AC_SUBST(LIRC_INCLUDE)
+ ])
+
diff --git a/abs/extra/xine-ui/xine-ui-0.99.6-1-i686-build.log.1 b/abs/extra/xine-ui/xine-ui-0.99.6-1-i686-build.log.1
new file mode 100644
index 0000000..d1d33d7
--- /dev/null
+++ b/abs/extra/xine-ui/xine-ui-0.99.6-1-i686-build.log.1
@@ -0,0 +1,2 @@
+/data/linhes_pkgbuild/abs/extra/xine-ui/PKGBUILD: line 25: cd: /data/linhes_pkgbuild/abs/extra/xine-ui/src/xine-ui-0.99.6: No such file or directory
+    Aborting...(B
diff --git a/abs/extra/xine-ui/xine-ui.install b/abs/extra/xine-ui/xine-ui.install
new file mode 100644
index 0000000..8afc566
--- /dev/null
+++ b/abs/extra/xine-ui/xine-ui.install
@@ -0,0 +1,12 @@
+post_install() {
+  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+  update-mime-database usr/share/mime &> /dev/null
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}