From edf373cc2568ea28fcedab53bda0e32a3c5386a1 Mon Sep 17 00:00:00 2001 From: Manuel Tortosa Date: Tue, 2 Nov 2010 17:35:39 +0000 Subject: [PATCH] Add xine-ui to master --- kdevelop-php-docs/PKGBUILD | 36 ------------- kdevelop-php/PKGBUILD | 36 ------------- xine-ui/PKGBUILD | 41 +++++++++++++++ xine-ui/fix_lirc.diff | 13 +++++ xine-ui/lirc-check-a89347673097.patch | 64 ++++++++++++++++++++++++ xine-ui/lirc-makefile-a68dd15ff7ae.patch | 19 +++++++ xine-ui/xine-ui.install | 12 +++++ 7 files changed, 149 insertions(+), 72 deletions(-) delete mode 100644 kdevelop-php-docs/PKGBUILD delete mode 100644 kdevelop-php/PKGBUILD create mode 100644 xine-ui/PKGBUILD create mode 100644 xine-ui/fix_lirc.diff create mode 100644 xine-ui/lirc-check-a89347673097.patch create mode 100644 xine-ui/lirc-makefile-a68dd15ff7ae.patch create mode 100644 xine-ui/xine-ui.install diff --git a/kdevelop-php-docs/PKGBUILD b/kdevelop-php-docs/PKGBUILD deleted file mode 100644 index 0bf054580..000000000 --- a/kdevelop-php-docs/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# -# Apps Packages for Chakra, part of chakra-project.org -# -# maintainer (i686): Phil Miller -# maintainer (x86_64): Manuel Tortosa - -# include global config -source ../_buildscripts/${current_repo}-${_arch}-cfg.conf - -pkgname=kdevelop-php-docs -pkgver=1.0.2 -_pkgver=4.0.2 -pkgrel=1 -pkgdesc="PHP docs plugin for Kdevelop" -arch=('i686' 'x86_64') -url="http://www.kdevelop.org/" -license=('GPL') -depends=("kdevelop-php=${pkgver}") -makedepends=('cmake' 'automoc4') -source=("http://download.kde.org/stable/kdevelop/${_pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('58bfb8b2afda44621371659fbd4b6553') - -build() { - cd ${srcdir} - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release - make -} - -package() { - cd ${srcdir}/build - make DESTDIR=${pkgdir} install -} diff --git a/kdevelop-php/PKGBUILD b/kdevelop-php/PKGBUILD deleted file mode 100644 index 344e7048f..000000000 --- a/kdevelop-php/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# -# Apps Packages for Chakra, part of chakra-project.org -# -# maintainer (i686): Phil Miller -# maintainer (x86_64): Manuel Tortosa - -# include global config -source ../_buildscripts/${current_repo}-${_arch}-cfg.conf - -pkgname=kdevelop-php -pkgver=1.0.2 -_pkgver=4.0.2 -pkgrel=1 -pkgdesc="PHP plugin for Kdevelop" -arch=('i686' 'x86_64') -url="http://www.kdevelop.org/" -license=('GPL') -depends=("kdevelop=${_pkgver}") -makedepends=('cmake' 'automoc4') -source=("http://download.kde.org/stable/kdevelop/${_pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('b049c8d4ab6e995d5fe7b03fa7b2f980') - -build() { - cd ${srcdir} - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release - make -} - -package() { - cd ${srcdir}/build - make DESTDIR=${pkgdir} install -} diff --git a/xine-ui/PKGBUILD b/xine-ui/PKGBUILD new file mode 100644 index 000000000..4c5471ffa --- /dev/null +++ b/xine-ui/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 77076 2010-04-10 16:09:26Z andrea $ +# Maintainer: Eric Belanger + +pkgname=xine-ui +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' + '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}" + 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-x --enable-lirc --without-aalib --enable-debug || return 1 + make || return 1 +} + +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/xine-ui/fix_lirc.diff b/xine-ui/fix_lirc.diff new file mode 100644 index 000000000..93890cb5c --- /dev/null +++ b/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/xine-ui/lirc-check-a89347673097.patch b/xine-ui/lirc-check-a89347673097.patch new file mode 100644 index 000000000..c1c8d2614 --- /dev/null +++ b/xine-ui/lirc-check-a89347673097.patch @@ -0,0 +1,64 @@ + +# HG changeset patch +# User Darren Salt +# 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/xine-ui/lirc-makefile-a68dd15ff7ae.patch b/xine-ui/lirc-makefile-a68dd15ff7ae.patch new file mode 100644 index 000000000..daad4f03a --- /dev/null +++ b/xine-ui/lirc-makefile-a68dd15ff7ae.patch @@ -0,0 +1,19 @@ + +# HG changeset patch +# User Darren Salt +# 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/xine-ui/xine-ui.install b/xine-ui/xine-ui.install new file mode 100644 index 000000000..8afc56658 --- /dev/null +++ b/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 +}