[arch-commits] Commit in xine-ui/trunk (6 files)
Eric Bélanger
eric at archlinux.org
Tue Apr 6 03:06:43 UTC 2010
Date: Monday, April 5, 2010 @ 23:06:42
Author: eric
Revision: 76010
Commiting local changes to trunk: Upstream update, Cleaned up depends, Removed optdepends, Replaced lirc makedepends by lirc-utils, Added shared-mime-info depends
Added:
xine-ui/trunk/fix_lirc.diff
xine-ui/trunk/lirc-check-a89347673097.patch
xine-ui/trunk/lirc-makefile-a68dd15ff7ae.patch
Modified:
xine-ui/trunk/ChangeLog
xine-ui/trunk/PKGBUILD
xine-ui/trunk/xine-ui.install
----------------------------------+
ChangeLog | 9 +++++
PKGBUILD | 31 +++++++++--------
fix_lirc.diff | 13 +++++++
lirc-check-a89347673097.patch | 64 +++++++++++++++++++++++++++++++++++++
lirc-makefile-a68dd15ff7ae.patch | 19 ++++++++++
xine-ui.install | 7 ++--
6 files changed, 126 insertions(+), 17 deletions(-)
Modified: ChangeLog
===================================================================
--- ChangeLog 2010-04-05 19:59:10 UTC (rev 76009)
+++ ChangeLog 2010-04-06 03:06:42 UTC (rev 76010)
@@ -1,3 +1,12 @@
+2010-03-23 Eric Belanger <eric at 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 at archlinux.org>
* xine-ui 0.99.5-6
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-04-05 19:59:10 UTC (rev 76009)
+++ PKGBUILD 2010-04-06 03:06:42 UTC (rev 76010)
@@ -2,31 +2,34 @@
# Maintainer: Eric Belanger <eric at archlinux.org>
pkgname=xine-ui
-pkgver=0.99.5
-pkgrel=6
+pkgver=0.99.6
+pkgrel=1
pkgdesc="A free video player for Unix"
arch=('i686' 'x86_64')
license=('GPL')
url="http://www.xine-project.org"
-depends=('xine-lib' 'curl' 'libxtst' 'libxinerama' 'libxv' 'libpng' 'libxft' 'libsm' 'libxxf86vm' 'ncurses' 'readline' 'xdg-utils')
-makedepends=('lirc' 'libxt')
-optdepends=('lirc')
-options=('!emptydirs')
+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=xine-ui.install
-source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.gz libpng14.patch)
-md5sums=('e643cd1fcad4d98a5ae4eb877ce5087b' 'b533aa5a5847ecabad28cc15879e1966')
-sha1sums=('4f452516319f31cda01d08ea2779f195933af0bb' '67db0d243e4fe482456db5efe174eaf4c6c50de6')
+source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.xz \
+ lirc-check-a89347673097.patch lirc-makefile-a68dd15ff7ae.patch fix_lirc.diff)
+md5sums=('d468b4e7fe39ff19888261e1da9be914' '4f06f63f5fd55b08a648e5d63f881898'\
+ '9f5acaf14f3945aa2ce428631d09cd47' '0174bd096756b9c6f47e9b8b5ff6e145')
+sha1sums=('abbdb331898c14025ee6b132f63ab7d3c1b5b31e' 'b2df43ede3a9d1a34b80139704a4cbbc7295c584'\
+ '8bbd39f61de7b6991385457a4944b8ea104da88b' '2361df9ddad59c426b0f863414c6d527b463a38a')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- patch -p1 < ../libpng14.patch || return 1
- #add missing constant (defined in xine.h from xine-lib cvs)
- echo '#define XINE_MSG_AUDIO_OUT_UNAVAILABLE 11' >> src/xitk/common.h || return 1
+ 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 || return 1
+ --with-x --enable-lirc --without-aalib --enable-debug || return 1
make || return 1
make DESTDIR="${pkgdir}" install || return 1
install -d "${pkgdir}/usr/share/applications"
- echo "Categories=Application;AudioVideo;" >> "${pkgdir}/usr/share/xine/desktop/xine.desktop" || return 1
mv "${pkgdir}/usr/share/xine/desktop/xine.desktop" "${pkgdir}/usr/share/applications"
}
Added: fix_lirc.diff
===================================================================
--- fix_lirc.diff (rev 0)
+++ fix_lirc.diff 2010-04-06 03:06:42 UTC (rev 76010)
@@ -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"
Added: lirc-check-a89347673097.patch
===================================================================
--- lirc-check-a89347673097.patch (rev 0)
+++ lirc-check-a89347673097.patch 2010-04-06 03:06:42 UTC (rev 76010)
@@ -0,0 +1,64 @@
+
+# HG changeset patch
+# User Darren Salt <linux at 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
+
Added: lirc-makefile-a68dd15ff7ae.patch
===================================================================
--- lirc-makefile-a68dd15ff7ae.patch (rev 0)
+++ lirc-makefile-a68dd15ff7ae.patch 2010-04-06 03:06:42 UTC (rev 76010)
@@ -0,0 +1,19 @@
+
+# HG changeset patch
+# User Darren Salt <linux at 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)
+ ])
+
Modified: xine-ui.install
===================================================================
--- xine-ui.install 2010-04-05 19:59:10 UTC (rev 76009)
+++ xine-ui.install 2010-04-06 03:06:42 UTC (rev 76010)
@@ -1,11 +1,12 @@
post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-mime-database usr/share/mime &> /dev/null
}
post_upgrade() {
- post_install
+ post_install
}
post_remove() {
- post_install
+ post_install
}
More information about the arch-commits
mailing list