[arch-commits] Commit in audacious/repos (4 files)

Sat Oct 3 16:43:26 UTC 2009

Date: Saturday, October 3, 2009 @ 12:43:26
  Author: giovanni
Revision: 53867

Merged revisions 53849,53864 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/audacious/trunk

........
  r53849 | andrea | 2009-10-03 07:54:33 -0700 (sab, 03 ott 2009) | 2 lines
  
  upgpkg: audacious 2.1-2
      FS#15559
........
  r53864 | andrea | 2009-10-03 09:29:11 -0700 (sab, 03 ott 2009) | 1 line
  
  added patch
........

Added:
  audacious/repos/extra-x86_64/remove_libudet.patch
    (from rev 53864, audacious/trunk/remove_libudet.patch)
Modified:
  audacious/repos/extra-x86_64/	(properties)
  audacious/repos/extra-x86_64/PKGBUILD
Deleted:
  audacious/repos/extra-x86_64/ChangeLog

----------------------+
 ChangeLog            |   31 ------------------
 PKGBUILD             |   24 +++++++++-----
 remove_libudet.patch |   80 +++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 96 insertions(+), 39 deletions(-)


Property changes on: audacious/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /audacious/trunk:1-45590
   + /audacious/trunk:1-53866

Deleted: extra-x86_64/ChangeLog
===================================================================

--- extra-x86_64/ChangeLog	2009-10-03 16:38:43 UTC (rev 53866)
+++ extra-x86_64/ChangeLog	2009-10-03 16:43:26 UTC (rev 53867)
@@ -1,31 +0,0 @@
-2009-07-12  Eric Belanger  <eric at archlinux.org>
-
-	* audacious-2.1.0-1
-	New upstream release.
-	Added audacious-plugins depends (close FS#14655)
-
-2008-08-16  Alexander Fehr  <pizzapunk gmail com>
-
-  * audacious-1.5.1-1:
-  New upstream release.
-  New maintainer.
-  Added dependencies on libxml2 and desktop-file-utils.
-  Removed dependency on libglade.
-  Made dependency on unzip optional.
-  Removed conflicts audacious-player.
-  Removed !libtool option.
-  Enabled SSE2 for x86_64.
-  Cleaned up install file.
-  Added update-desktop-database to install file.
-
-2008-03-15  Travis Willard  <travis at archlinux.org>
-
-  * audacious-1.5.0-1:
-  New upstream release.
-  Renamed audacious-player to audacious - been a long time coming.
-
-2008-02-16  Travis Willard  <travis at archlinux.org>
-
-  * audacious-1.4.6-1:
-  New upstream release.
-  Added ChangeLog.

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-10-03 16:38:43 UTC (rev 53866)
+++ extra-x86_64/PKGBUILD	2009-10-03 16:43:26 UTC (rev 53867)
@@ -1,29 +1,37 @@
 # $Id$
-# Maintainer: Alexander Fehr <pizzapunk gmail com>
+# Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: William Rea <sillywilly at gmail.com>
 
 pkgname=audacious
 pkgver=2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Media player based on BMP"
 arch=('i686' 'x86_64')
 url="http://audacious-media-player.org/"
 license=('GPL3')
-depends=('gtk2' 'libmcs' 'dbus-glib' 'libsamplerate' 'libxml2' 'desktop-file-utils' 'audacious-plugins')
+depends=('gtk2' 'libmcs' 'dbus-glib' 'libsamplerate' 'libxml2' 'desktop-file-utils'
+	'audacious-plugins')
 optdepends=('unzip: Zipped skins support')
 provides=('audacious-player')
 replaces=('audacious-player')
 install=audacious.install
-source=(http://distfiles.atheme.org/audacious-$pkgver.tgz)
-md5sums=('03ab6a062e5909214841f90f767f1147')
+source=(http://distfiles.atheme.org/$pkgname-$pkgver.tgz
+	'remove_libudet.patch')
+md5sums=('03ab6a062e5909214841f90f767f1147'
+         'd194f9f187c415b60165dd584ae3bad1')
 
 build() {
-  cd "$srcdir/audacious-$pkgver"
+  cd "$srcdir/$pkgname-$pkgver"
 
+  patch -Np1 -i ${srcdir}/remove_libudet.patch || return 1
+
   if [[ $CARCH == "i686" ]]; then
-    ./configure --prefix=/usr --enable-samplerate --disable-sse2 || return 1
+    ./configure --prefix=/usr \
+      --enable-samplerate \
+      --disable-sse2 || return 1
   elif [[ $CARCH == "x86_64" ]]; then
-    ./configure --prefix=/usr --enable-samplerate || return 1
+    ./configure --prefix=/usr \
+      --enable-samplerate || return 1
   fi
 
   make || return 1

Copied: audacious/repos/extra-x86_64/remove_libudet.patch (from rev 53864, audacious/trunk/remove_libudet.patch)
===================================================================
--- extra-x86_64/remove_libudet.patch	                        (rev 0)
+++ extra-x86_64/remove_libudet.patch	2009-10-03 16:43:26 UTC (rev 53867)
@@ -0,0 +1,80 @@
+
+# HG changeset patch
+# User John Lindgren <john.lindgren at tds.net>
+# Date 1248286313 14400
+# Node ID d7e5d6e22a135f196becd237a28fca2469482a47
+# Parent  6cf3885ad1009feea34c5b67f3bd7f4c3fbdd82c
+Remove references to the mysterious, unused libudet, since Audacious seems to build fine without it.
+
+--- a/configure.ac	Wed Jul 22 11:30:19 2009 -0400
++++ b/configure.ac	Wed Jul 22 14:11:53 2009 -0400
+@@ -94,11 +94,6 @@
+ [charset detection support],
+ [
+     AC_DEFINE([USE_CHARDET], 1, [Define if character set detection enabled])
+-    AC_CHECK_LIB([udet_c], [detectCharset], [
+-        AC_DEFINE([HAVE_UDET], 1, [Define if the system has Mozilla universal character detector library])
+-        CHARDET_LIBS="$CHARDET_LIBS -ludet -ludet_c"
+-        AC_SUBST([CHARDET_LIBS])
+-    ])
+ ])
+ AUD_CONDITIONAL([USE_CHARDET], [enable_chardet])
+ 
+--- a/src/audacious/chardet.c	Wed Jul 22 11:30:19 2009 -0400
++++ b/src/audacious/chardet.c	Wed Jul 22 14:11:53 2009 -0400
+@@ -24,9 +24,6 @@
+ 
+ #ifdef USE_CHARDET
+ #include "../libguess/libguess.h"
+-#  ifdef HAVE_UDET
+-#    include <libudet_c.h>
+-#  endif
+ #endif
+ 
+ gchar *
+@@ -66,11 +63,9 @@
+     if (dfa_validate_utf8(str, strlen(str)))
+         return g_strdup(str);
+ 
+-#  ifdef HAVE_UDET
+     /* chardet encoding detector */
+     if ((out_str = chardet_to_utf8(str, strlen(str), NULL, NULL, NULL)))
+         return out_str;
+-#  endif
+ #endif
+ 
+     /* assume encoding associated with locale */
+@@ -145,7 +140,7 @@
+ 			ret = NULL;
+ 		}
+ 	}
+-	
++
+ 	return NULL;	/* if I have no idea, return NULL. */
+ }
+ 
+--- a/src/audacious/ui_preferences.c	Wed Jul 22 11:30:19 2009 -0400
++++ b/src/audacious/ui_preferences.c	Wed Jul 22 14:11:53 2009 -0400
+@@ -162,9 +162,7 @@
+     { N_("Hebrew")   , N_("Hebrew") },
+     { N_("Turkish")  , N_("Turkish") },
+     { N_("Arabic")   , N_("Arabic") },
+-#ifdef HAVE_UDET
+     { N_("Universal"), N_("Universal") }
+-#endif
+ };
+ 
+ static ComboBoxElements bitdepth_elements[] = {
+--- a/src/audacious/ui_urlopener.c	Wed Jul 22 11:30:19 2009 -0400
++++ b/src/audacious/ui_urlopener.c	Wed Jul 22 14:11:53 2009 -0400
+@@ -48,9 +48,6 @@
+ 
+ #ifdef USE_CHARDET
+ #include "../libguess/libguess.h"
+-#  ifdef HAVE_UDET
+-#    include <libudet_c.h>
+-#  endif
+ #endif
+ 
+ #define URL_HISTORY_MAX_SIZE 30
+


