[arch-commits] Commit in xine-ui/trunk (PKGBUILD libpng14.patch)

[Andrea Scarpino]

    Date: Saturday, April 10, 2010 @ 12:09:26
  Author: andrea
Revision: 77076

upgpkg: xine-ui 0.99.6-1
upstream release

Modified:
  xine-ui/trunk/PKGBUILD
Deleted:
  xine-ui/trunk/libpng14.patch

----------------+
 PKGBUILD       |   24 +++++++++++++++---------
 libpng14.patch |   12 ------------
 2 files changed, 15 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-04-10 16:05:55 UTC (rev 77075)
+++ PKGBUILD	2010-04-10 16:09:26 UTC (rev 77076)
@@ -8,16 +8,18 @@
 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')
+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.xz \
-        lirc-check-a89347673097.patch lirc-makefile-a68dd15ff7ae.patch fix_lirc.diff)
-md5sums=('d468b4e7fe39ff19888261e1da9be914' '4f06f63f5fd55b08a648e5d63f881898'\
-         '9f5acaf14f3945aa2ce428631d09cd47' '0174bd096756b9c6f47e9b8b5ff6e145')
-sha1sums=('abbdb331898c14025ee6b132f63ab7d3c1b5b31e' 'b2df43ede3a9d1a34b80139704a4cbbc7295c584'\
-         '8bbd39f61de7b6991385457a4944b8ea104da88b' '2361df9ddad59c426b0f863414c6d527b463a38a')
+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}"
@@ -29,6 +31,10 @@
   ./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"

Deleted: libpng14.patch
===================================================================
--- libpng14.patch	2010-04-10 16:05:55 UTC (rev 77075)
+++ libpng14.patch	2010-04-10 16:09:26 UTC (rev 77076)
@@ -1,12 +0,0 @@
-diff -Naur xine-ui-0.99.5-orig/src/xitk/Imlib-light/load.c xine-ui-0.99.5/src/xitk/Imlib-light/load.c
---- xine-ui-0.99.5-orig/src/xitk/Imlib-light/load.c	2010-01-19 02:46:21.000000000 -0500
-+++ xine-ui-0.99.5/src/xitk/Imlib-light/load.c	2010-01-19 02:49:22.000000000 -0500
-@@ -193,7 +193,7 @@
-     return 0;
-   fread(buf, 1, 8, f);
-   rewind(f);
--  return (int)png_check_sig(buf, 8);
-+  return (int)png_sig_cmp(buf, 0, 8)==0;
- }
- 
- ImlibImage * Imlib_load_image(ImlibData * id, char *file) {