summaryrefslogtreecommitdiff
path: root/community
diff options
context:
space:
mode:
Diffstat (limited to 'community')
-rw-r--r--community/autofs/0001-autofs-5.0.5-include-krb5-library.patch206
-rw-r--r--community/autofs/0002-autofs-5.0.5-remove-ERR_remove_state-openssl-call.patch59
-rw-r--r--community/autofs/PKGBUILD11
-rw-r--r--community/minbif/PKGBUILD6
-rw-r--r--community/mplayer2/PKGBUILD59
-rw-r--r--community/mplayer2/mplayer2-remove-mp3lib.patch297
6 files changed, 633 insertions, 5 deletions
diff --git a/community/autofs/0001-autofs-5.0.5-include-krb5-library.patch b/community/autofs/0001-autofs-5.0.5-include-krb5-library.patch
new file mode 100644
index 000000000..572ca97fd
--- /dev/null
+++ b/community/autofs/0001-autofs-5.0.5-include-krb5-library.patch
@@ -0,0 +1,206 @@
+From e467755fac27630730be25c4b41e5d0cfcd89c67 Mon Sep 17 00:00:00 2001
+From: Ian Kent <raven@themaw.net>
+Date: Tue, 10 Aug 2010 15:48:21 +0800
+Subject: [PATCH 1/2] autofs-5.0.5 - include krb5 library
+
+Since the Cyrus SASL module calls Kerberos directly we should be
+linking against the Kerberos librarys.
+---
+ Makefile.conf.in | 2 +
+ aclocal.m4 | 19 +++++++++++++++
+ configure | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
+ configure.in | 5 +++-
+ modules/Makefile | 4 +-
+ 5 files changed, 93 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile.conf.in b/Makefile.conf.in
+index f0287c3..a9bcf8c 100644
+--- a/Makefile.conf.in
++++ b/Makefile.conf.in
+@@ -31,6 +31,8 @@ XML_FLAGS = @XML_FLAGS@
+ SASL = @HAVE_SASL@
+ LIBSASL= @LIBSASL@
+ SASL_FLAGS = @SASL_FLAGS@
++KRB5_LIBS=@KRB5_LIBS@
++KRB5_FLAGS=@KRB5_FLAGS@
+
+ # NIS+ support: yes (1) no (0)
+ NISPLUS = @HAVE_NISPLUS@
+diff --git a/aclocal.m4 b/aclocal.m4
+index e7f1a30..750a159 100644
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -215,6 +215,25 @@ else
+ fi])
+
+ dnl --------------------------------------------------------------------------
++dnl AF_CHECK_KRB5
++dnl
++dnl Check for Kerberos 5
++dnl --------------------------------------------------------------------------
++AC_DEFUN([AF_CHECK_KRB5],
++[AC_PATH_PROGS(KRB5_CONFIG, krb5-config, no)
++AC_MSG_CHECKING(for Kerberos library)
++if test "$KRB5_CONFIG" = "no"
++then
++ AC_MSG_RESULT(no)
++ HAVE_KRB5=0
++else
++ AC_MSG_RESULT(yes)
++ HAVE_KRB5=1
++ KRB5_LIBS=`$KRB5_CONFIG --libs`
++ KRB5_FLAGS=`$KRB5_CONFIG --cflags`
++fi])
++
++dnl --------------------------------------------------------------------------
+ dnl AF_CHECK_LIBHESIOD
+ dnl
+ dnl Check for lib hesiod
+diff --git a/configure b/configure
+index 159f25f..500411c 100755
+--- a/configure
++++ b/configure
+@@ -640,6 +640,8 @@ ac_subst_vars='LTLIBOBJS
+ LIBOBJS
+ DAEMON_LDFLAGS
+ DAEMON_CFLAGS
++KRB5_FLAGS
++KRB5_LIBS
+ LIBSASL
+ HAVE_SASL
+ SASL_FLAGS
+@@ -657,6 +659,7 @@ LIBHESIOD
+ HAVE_HESIOD
+ LIBRESOLV
+ LIBNSL
++KRB5_CONFIG
+ XML_CONFIG
+ PATH_RPCGEN
+ RPCGEN
+@@ -3723,7 +3726,7 @@ $as_echo "no" >&6; }
+ fi
+ fi
+
+-# LDAP SASL auth need libxml
++# LDAP SASL auth needs libxml and Kerberos
+ for ac_prog in xml2-config
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+@@ -3801,6 +3804,66 @@ _ACEOF
+ fi
+ fi
+ fi
++for ac_prog in krb5-config
++do
++ # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_path_KRB5_CONFIG+set}" = set; then
++ $as_echo_n "(cached) " >&6
++else
++ case $KRB5_CONFIG in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_KRB5_CONFIG="$KRB5_CONFIG" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_path_KRB5_CONFIG="$as_dir/$ac_word$ac_exec_ext"
++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
++
++ ;;
++esac
++fi
++KRB5_CONFIG=$ac_cv_path_KRB5_CONFIG
++if test -n "$KRB5_CONFIG"; then
++ { $as_echo "$as_me:$LINENO: result: $KRB5_CONFIG" >&5
++$as_echo "$KRB5_CONFIG" >&6; }
++else
++ { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++
++ test -n "$KRB5_CONFIG" && break
++done
++test -n "$KRB5_CONFIG" || KRB5_CONFIG="no"
++
++{ $as_echo "$as_me:$LINENO: checking for Kerberos library" >&5
++$as_echo_n "checking for Kerberos library... " >&6; }
++if test "$KRB5_CONFIG" = "no"
++then
++ { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
++ HAVE_KRB5=0
++else
++ { $as_echo "$as_me:$LINENO: result: yes" >&5
++$as_echo "yes" >&6; }
++ HAVE_KRB5=1
++ KRB5_LIBS=`$KRB5_CONFIG --libs`
++ KRB5_FLAGS=`$KRB5_CONFIG --cflags`
++fi
+
+ #
+ # glibc/libc 6 new libraries
+@@ -5178,6 +5241,8 @@ fi
+
+
+
++
++
+ LDFLAGS="${AF_tmp_ldflags}"
+
+ #
+diff --git a/configure.in b/configure.in
+index f649a58..70b45e8 100644
+--- a/configure.in
++++ b/configure.in
+@@ -144,8 +144,9 @@ AF_CHECK_PROG(RPCGEN, rpcgen, , $searchpath)
+ #
+ AF_SLOPPY_MOUNT()
+
+-# LDAP SASL auth need libxml
++# LDAP SASL auth needs libxml and Kerberos
+ AF_CHECK_LIBXML()
++AF_CHECK_KRB5()
+
+ #
+ # glibc/libc 6 new libraries
+@@ -274,6 +275,8 @@ AC_SUBST(XML_LIBS)
+ AC_SUBST(SASL_FLAGS)
+ AC_SUBST(HAVE_SASL)
+ AC_SUBST(LIBSASL)
++AC_SUBST(KRB5_LIBS)
++AC_SUBST(KRB5_FLAGS)
+ LDFLAGS="${AF_tmp_ldflags}"
+
+ #
+diff --git a/modules/Makefile b/modules/Makefile
+index 13b3bd8..2389196 100644
+--- a/modules/Makefile
++++ b/modules/Makefile
+@@ -42,8 +42,8 @@ ifeq ($(LDAP), 1)
+ MODS += lookup_ldap.so
+ ifeq ($(SASL), 1)
+ SASL_OBJ = cyrus-sasl.o
+- LDAP_FLAGS += $(SASL_FLAGS) $(XML_FLAGS) -DLDAP_THREAD_SAFE
+- LIBLDAP += $(LIBSASL) $(XML_LIBS)
++ LDAP_FLAGS += $(SASL_FLAGS) $(XML_FLAGS) $(KRB5_FLAGS) -DLDAP_THREAD_SAFE
++ LIBLDAP += $(LIBSASL) $(XML_LIBS) $(KRB5_LIBS)
+ endif
+ endif
+
+--
+1.7.5.1
+
diff --git a/community/autofs/0002-autofs-5.0.5-remove-ERR_remove_state-openssl-call.patch b/community/autofs/0002-autofs-5.0.5-remove-ERR_remove_state-openssl-call.patch
new file mode 100644
index 000000000..e4e480e82
--- /dev/null
+++ b/community/autofs/0002-autofs-5.0.5-remove-ERR_remove_state-openssl-call.patch
@@ -0,0 +1,59 @@
+From 205c305922cdbded91ff8fadbaad7959bdb497bc Mon Sep 17 00:00:00 2001
+From: Ian Kent <raven@themaw.net>
+Date: Wed, 11 Aug 2010 09:33:09 +0800
+Subject: [PATCH 2/2] autofs-5.0.5 - remove ERR_remove_state() openssl call
+
+autofs should never have had to use ERR_remove_state() so remove that call.
+
+Lukas: Resolve a conflict in "CHANGELOG" that occured due to cherry
+picking Kerberos related patches from the 5.0.6 development branch.
+
+Conflicts:
+
+ CHANGELOG
+
+Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
+---
+ CHANGELOG | 4 ++++
+ modules/lookup_ldap.c | 12 +-----------
+ 2 files changed, 5 insertions(+), 11 deletions(-)
+
+diff --git a/CHANGELOG b/CHANGELOG
+index e734cb3..1a20a81 100644
+--- a/CHANGELOG
++++ b/CHANGELOG
+@@ -1,3 +1,7 @@
++??/??/20?? autofs-5.0.6
++-----------------------
++- remove ERR_remove_state() openssl call.
++
+ 03/09/2009 autofs-5.0.5
+ -----------------------
+ - fix dumb libxml2 check
+diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c
+index 2ecf5fe..1221c2c 100644
+--- a/modules/lookup_ldap.c
++++ b/modules/lookup_ldap.c
+@@ -168,18 +168,8 @@ int unbind_ldap_connection(unsigned logopt, LDAP *ldap, struct lookup_context *c
+ int rv;
+
+ #ifdef WITH_SASL
+- /*
+- * The OpenSSL library can't handle having its message and error
+- * string database loaded multiple times and segfaults if the
+- * TLS environment is not reset at the right times. As there
+- * is no ldap_stop_tls call in the openldap library we have
+- * to do the job ourselves, here and in lookup_done when the
+- * module is closed.
+- */
+- if (ctxt->use_tls == LDAP_TLS_RELEASE) {
+- ERR_remove_state(0);
++ if (ctxt->use_tls == LDAP_TLS_RELEASE)
+ ctxt->use_tls = LDAP_TLS_INIT;
+- }
+ autofs_sasl_unbind(ctxt);
+ #endif
+
+--
+1.7.5.1
+
diff --git a/community/autofs/PKGBUILD b/community/autofs/PKGBUILD
index 11ac57ec1..6516f9736 100644
--- a/community/autofs/PKGBUILD
+++ b/community/autofs/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 46345 2011-05-05 11:57:37Z spupykin $
+# $Id: PKGBUILD 47057 2011-05-15 17:16:45Z lfleischer $
# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Dale Blount <dale@archlinux.org>
@@ -6,7 +6,7 @@
pkgname=autofs
pkgver=5.0.5
-pkgrel=6
+pkgrel=7
pkgdesc='A kernel-based automounter for Linux.'
arch=('i686' 'x86_64')
url='http://freshmeat.net/projects/autofs'
@@ -18,11 +18,15 @@ backup=('etc/autofs/auto.master'
options=(!makeflags)
install='autofs.install'
source=("http://www.kernel.org/pub/linux/daemons/${pkgname}/v5/${pkgname}-${pkgver}.tar.bz2"
+ "0001-${pkgname}-5.0.5-include-krb5-library.patch"
+ "0002-${pkgname}-5.0.5-remove-ERR_remove_state-openssl-call.patch"
'autofs'
'autofs.conf.d'
'auto.master'
'auto.misc')
md5sums=('a1d262cb6ebef0c2dd0fe22232fb3d5a'
+ '478737b8e3e79365a0e183aa95aab307'
+ 'e347999e5dffe142e7e57b067d3d9e9f'
'e307bf6d2638e46eeb916cf42fe029b2'
'47f597c870410055e0fdb66103daf928'
'a6cefb591e77b31b79dbb7243646c96b'
@@ -34,6 +38,9 @@ build() {
sed -i "s:SUBDIRS = lib daemon modules man samples:SUBDIRS = lib daemon modules man:" \
Makefile.rules
+ patch -p1 -i "../0001-${pkgname}-5.0.5-include-krb5-library.patch"
+ patch -p1 -i "../0002-${pkgname}-5.0.5-remove-ERR_remove_state-openssl-call.patch"
+
./configure --prefix=/usr --sysconfdir=/etc/autofs --with-mapdir=/etc/autofs --without-hesiod \
--enable-ignore-busy
make
diff --git a/community/minbif/PKGBUILD b/community/minbif/PKGBUILD
index 091830228..2aee17a20 100644
--- a/community/minbif/PKGBUILD
+++ b/community/minbif/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 44211 2011-04-04 13:30:46Z lfleischer $
+# $Id: PKGBUILD 47062 2011-05-15 17:37:33Z lfleischer $
# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
# Contributor: AkiraYB <brunoyb!yahoo,com,br>
pkgname=minbif
pkgver=1.0.4
-pkgrel=2
+pkgrel=3
pkgdesc='An IRC gateway to IM networks that uses libpurple.'
arch=('i686' 'x86_64')
url='http://minbif.im/'
@@ -24,7 +24,7 @@ build() {
cd "${srcdir}/${pkgname}-${pkgver}"
make PREFIX=/usr CONF_PREFIX=/etc/minbif ENABLE_MINBIF=ON ENABLE_IMLIB=ON ENABLE_CACA=ON \
- ENABLE_VIDEO=ON ENABLE_PLUGIN=OFF ENABLE_PAM=ON ENABLE_TLS=ON DEBUG=OFF
+ ENABLE_VIDEO=OFF ENABLE_PLUGIN=OFF ENABLE_PAM=ON ENABLE_TLS=ON DEBUG=OFF
}
package() {
diff --git a/community/mplayer2/PKGBUILD b/community/mplayer2/PKGBUILD
new file mode 100644
index 000000000..828951df8
--- /dev/null
+++ b/community/mplayer2/PKGBUILD
@@ -0,0 +1,59 @@
+# $Id: PKGBUILD 46583 2011-05-09 18:34:40Z stephane $
+# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
+# Contributor: Bartek Piotrowski <barthalion@gmail.com>
+
+pkgname=mplayer2
+pkgver=2.0
+pkgrel=12
+pkgdesc="A movie player"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.mplayer2.org/"
+depends=('libgl' 'libvdpau' 'ffmpeg' 'libdvdcss' 'libdvdread' 'libdvdnav' 'libxvmc' 'libass' 'fontconfig' 'freetype2'
+ 'ttf-dejavu' 'sdl' 'aalib' 'libcaca' 'faad2' 'libpulse' 'jack' 'ncurses' 'libxxf86vm' 'cdparanoia' 'libmad'
+ 'a52dec' 'libdca' 'libxxf86dga' 'libxss' 'mpg123')
+makedepends=('live-media' 'mesa' 'unzip' 'yasm')
+backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
+provides=('mplayer')
+conflicts=('mplayer')
+source=(http://ftp.mplayer2.org/pub/release/${pkgname}-${pkgver/_/-}.tar.xz
+ mplayer2-remove-mp3lib.patch)
+sha1sums=('0df8d4e5484128b7b28029273b7704ab5d5419bc'
+ 'c55128a99406a5e01ab077555b7b24aa7b54110c')
+options=('!emptydirs')
+
+build() {
+ # Custom CFLAGS break the mplayer build
+ unset CFLAGS LDFLAGS
+
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ # Drop internal mp3lib (FS#24149)
+ # Default decoder for mp3 will be mpg123
+ rm -fr mp3lib
+ patch -Np1 -i ../mplayer2-remove-mp3lib.patch
+
+ ./configure --prefix=/usr \
+ --enable-runtime-cpudetection \
+ --disable-arts \
+ --disable-speex \
+ --disable-openal \
+ --disable-libdv \
+ --disable-musepack \
+ --disable-esd \
+ --disable-mga \
+ --enable-xvmc \
+ --language=all \
+ --enable-translation \
+ --confdir=/etc/mplayer
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ make DESTDIR="${pkgdir}" install
+ install -Dm644 etc/{codecs.conf,input.conf,example.conf} "${pkgdir}"/etc/mplayer/
+ install -dm755 "${pkgdir}"/usr/share/mplayer/
+ ln -s /usr/share/fonts/TTF/DejaVuSans.ttf "${pkgdir}"/usr/share/mplayer/subfont.ttf
+}
diff --git a/community/mplayer2/mplayer2-remove-mp3lib.patch b/community/mplayer2/mplayer2-remove-mp3lib.patch
new file mode 100644
index 000000000..057a91295
--- /dev/null
+++ b/community/mplayer2/mplayer2-remove-mp3lib.patch
@@ -0,0 +1,297 @@
+diff -Naur mplayer2-2.0.ori/configure mplayer2-2.0/configure
+--- mplayer2-2.0.ori/configure 2011-03-24 17:40:29.000000000 -0400
++++ mplayer2-2.0/configure 2011-05-09 14:11:10.717630210 -0400
+@@ -376,7 +376,6 @@
+ --disable-mad disable libmad (MPEG audio) support [autodetect]
+ --enable-xmms enable XMMS input plugin support [disabled]
+ --enable-libdca enable libdca support [autodetect]
+- --disable-mp3lib disable builtin mp3lib [autodetect]
+ --disable-liba52 disable liba52 [autodetect]
+ --enable-musepack enable libmpcdec support (deprecated, libavcodec
+ Musepack decoder is preferred) [disabled]
+@@ -610,7 +609,6 @@
+ _speex=auto
+ _theora=auto
+ _mpg123=auto
+-_mp3lib=auto
+ _liba52=auto
+ _libdca=auto
+ _faad=auto
+@@ -965,8 +963,6 @@
+ --disable-theora) _theora=no ;;
+ --enable-mpg123) _mpg123=yes ;;
+ --disable-mpg123) _mpg123=no ;;
+- --enable-mp3lib) _mp3lib=yes ;;
+- --disable-mp3lib) _mp3lib=no ;;
+ --enable-liba52) _liba52=yes ;;
+ --disable-liba52) _liba52=no ;;
+ --enable-libdca) _libdca=yes ;;
+@@ -5731,19 +5727,6 @@
+ fi
+ echores "$_theora"
+
+-echocheck "mp3lib support"
+-if test "$_mp3lib" = auto ; then
+- test "$cc_vendor" = intel && test "$_cc_major" -le 10 -o "$_cc_major" -eq 11 -a "$_cc_minor" -eq 0 && _mp3lib=no || _mp3lib=yes
+-fi
+-if test "$_mp3lib" = yes ; then
+- def_mp3lib='#define CONFIG_MP3LIB 1'
+- codecmodules="mp3lib(internal) $codecmodules"
+-else
+- def_mp3lib='#undef CONFIG_MP3LIB'
+- nocodecmodules="mp3lib(internal) $nocodecmodules"
+-fi
+-echores "$_mp3lib"
+-
+ # Any version of libmpg123 shall be fine.
+ echocheck "mpg123 support"
+ def_mpg123='#undef CONFIG_MPG123'
+@@ -6823,7 +6806,6 @@
+ MD5SUM = $_md5sum
+ MGA = $_mga
+ MNG = $_mng
+-MP3LIB = $_mp3lib
+ MPG123 = $_mpg123
+ MUSEPACK = $_musepack
+ NAS = $_nas
+@@ -7084,7 +7066,6 @@
+ $def_libdca
+ $def_libdv
+ $def_mad
+-$def_mp3lib
+ $def_mpg123
+ $def_musepack
+ $def_speex
+diff -Naur mplayer2-2.0.ori/etc/codecs.conf mplayer2-2.0/etc/codecs.conf
+--- mplayer2-2.0.ori/etc/codecs.conf 2011-03-24 17:40:29.000000000 -0400
++++ mplayer2-2.0/etc/codecs.conf 2011-05-09 14:11:10.717630210 -0400
+@@ -4220,23 +4220,6 @@
+ driver ffmpeg
+ dll "sonic"
+
+-audiocodec mp3
+- ; this is preferred over ffmp2/ffmp3 since it is faster due to using
+- ; floating point and there are even broken mkv files where the audio
+- ; needs to be parsed, making this codec work more reliably
+- info "mp3lib MPEG layer-2, layer-3"
+- status working
+- comment "Optimized to MMX/SSE/3Dnow!"
+- format 0x50 ; layer-1 && layer-2
+- format 0x55 ; layer-3
+- format 0x5500736d ; "ms\0\x55" older mp3 fcc (MOV files)
+- format 0x5000736d ; "ms\0\x50" older mp2 fcc (MOV files)
+- format 0x55005354 ; broken file
+- fourcc ".mp3" ; CBR/VBR MP3 (MOV files)
+- fourcc "MP3 " ; used in .nsv files
+- fourcc "LAME" ; used in mythtv .nuv files
+- driver mp3lib
+-
+ audiocodec mpg123
+ ; this is preferred over ffmp2/ffmp3 since it is faster, generally
+ info "MPEG 1.0/2.0/2.5 layers I, II, III"
+diff -Naur mplayer2-2.0.ori/libmpcodecs/ad.c mplayer2-2.0/libmpcodecs/ad.c
+--- mplayer2-2.0.ori/libmpcodecs/ad.c 2011-03-24 17:40:29.000000000 -0400
++++ mplayer2-2.0/libmpcodecs/ad.c 2011-05-09 14:11:10.717630210 -0400
+@@ -32,7 +32,6 @@
+ /* Missed vorbis, mad, dshow */
+
+ extern const ad_functions_t mpcodecs_ad_mpg123;
+-extern const ad_functions_t mpcodecs_ad_mp3lib;
+ extern const ad_functions_t mpcodecs_ad_ffmpeg;
+ extern const ad_functions_t mpcodecs_ad_liba52;
+ extern const ad_functions_t mpcodecs_ad_hwac3;
+@@ -63,9 +62,6 @@
+ #ifdef CONFIG_MPG123
+ &mpcodecs_ad_mpg123,
+ #endif
+-#ifdef CONFIG_MP3LIB
+- &mpcodecs_ad_mp3lib,
+-#endif
+ #ifdef CONFIG_LIBA52
+ &mpcodecs_ad_liba52,
+ #endif
+diff -Naur mplayer2-2.0.ori/libmpcodecs/ad_mp3lib.c mplayer2-2.0/libmpcodecs/ad_mp3lib.c
+--- mplayer2-2.0.ori/libmpcodecs/ad_mp3lib.c 2011-03-24 17:40:29.000000000 -0400
++++ mplayer2-2.0/libmpcodecs/ad_mp3lib.c 2011-05-09 14:11:10.717630210 -0400
+@@ -1,100 +0,0 @@
+-/*
+- * This file is part of MPlayer.
+- *
+- * MPlayer is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation; either version 2 of the License, or
+- * (at your option) any later version.
+- *
+- * MPlayer is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+- * GNU General Public License for more details.
+- *
+- * You should have received a copy of the GNU General Public License along
+- * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+- */
+-
+-#include <stdio.h>
+-#include <stdlib.h>
+-#include <unistd.h>
+-
+-#include "config.h"
+-
+-#include "ad_internal.h"
+-#include "ad_mp3lib.h"
+-
+-static const ad_info_t info =
+-{
+- "MPEG layer-2, layer-3",
+- "mp3lib",
+- "Nick Kurshev",
+- "mpg123",
+- "Optimized to MMX/SSE/3Dnow!"
+-};
+-
+-LIBAD_EXTERN(mp3lib)
+-
+-#include "mp3lib/mp3.h"
+-
+-extern int fakemono;
+-
+-static sh_audio_t* dec_audio_sh=NULL;
+-
+-// MP3 decoder buffer callback:
+-int mplayer_audio_read(char *buf,int size){
+- return demux_read_data(dec_audio_sh->ds,buf,size);
+-}
+-
+-static int preinit(sh_audio_t *sh)
+-{
+- sh->audio_out_minsize=32*36*2*2; //4608;
+- return 1;
+-}
+-
+-static int init(sh_audio_t *sh)
+-{
+- // MPEG Audio:
+- dec_audio_sh=sh; // save sh_audio for the callback:
+-// MP3_Init(fakemono,mplayer_accel,&mplayer_audio_read); // TODO!!!
+-#ifdef CONFIG_FAKE_MONO
+- MP3_Init(fakemono);
+-#else
+- MP3_Init();
+-#endif
+- MP3_samplerate=MP3_channels=0;
+- sh->a_buffer_len=MP3_DecodeFrame(sh->a_buffer,-1);
+- if(!sh->a_buffer_len) return 0; // unsupported layer/format
+- sh->channels=2; // hack
+- sh->samplesize=2;
+- sh->samplerate=MP3_samplerate;
+- sh->i_bps=MP3_bitrate*(1000/8);
+- MP3_PrintHeader();
+- return 1;
+-}
+-
+-static void uninit(sh_audio_t *sh)
+-{
+-}
+-
+-static int control(sh_audio_t *sh,int cmd,void* arg, ...)
+-{
+- switch(cmd)
+- {
+- case ADCTRL_RESYNC_STREAM:
+- MP3_DecodeFrame(NULL,-2); // resync
+- MP3_DecodeFrame(NULL,-2); // resync
+- MP3_DecodeFrame(NULL,-2); // resync
+- return CONTROL_TRUE;
+- case ADCTRL_SKIP_FRAME:
+- MP3_DecodeFrame(NULL,-2); // skip MPEG frame
+- return CONTROL_TRUE;
+- }
+- return CONTROL_UNKNOWN;
+-}
+-
+-static int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int maxlen)
+-{
+- return MP3_DecodeFrame(buf,-1);
+-}
+diff -Naur mplayer2-2.0.ori/libmpcodecs/ad_mp3lib.h mplayer2-2.0/libmpcodecs/ad_mp3lib.h
+--- mplayer2-2.0.ori/libmpcodecs/ad_mp3lib.h 2011-03-24 17:40:29.000000000 -0400
++++ mplayer2-2.0/libmpcodecs/ad_mp3lib.h 2011-05-09 14:11:10.717630210 -0400
+@@ -1,24 +0,0 @@
+-/*
+- * This file is part of MPlayer.
+- *
+- * MPlayer is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation; either version 2 of the License, or
+- * (at your option) any later version.
+- *
+- * MPlayer is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+- * GNU General Public License for more details.
+- *
+- * You should have received a copy of the GNU General Public License along
+- * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+- */
+-
+-#ifndef MPLAYER_AD_MP3LIB_H
+-#define MPLAYER_AD_MP3LIB_H
+-
+-int mplayer_audio_read(char *buf, int size);
+-
+-#endif /* MPLAYER_AD_MP3LIB_H */
+diff -Naur mplayer2-2.0.ori/Makefile mplayer2-2.0/Makefile
+--- mplayer2-2.0.ori/Makefile 2011-03-24 17:40:29.000000000 -0400
++++ mplayer2-2.0/Makefile 2011-05-09 14:11:10.714296876 -0400
+@@ -122,21 +122,6 @@
+ SRCS_COMMON-$(MNG) += libmpdemux/demux_mng.c
+ SRCS_COMMON-$(MPG123) += libmpcodecs/ad_mpg123.c
+
+-SRCS_MP3LIB-X86-$(HAVE_AMD3DNOW) += mp3lib/dct36_3dnow.c \
+- mp3lib/dct64_3dnow.c
+-SRCS_MP3LIB-X86-$(HAVE_AMD3DNOWEXT) += mp3lib/dct36_k7.c \
+- mp3lib/dct64_k7.c
+-SRCS_MP3LIB-X86-$(HAVE_MMX) += mp3lib/dct64_mmx.c
+-SRCS_MP3LIB-$(ARCH_X86_32) += mp3lib/decode_i586.c \
+- $(SRCS_MP3LIB-X86-yes)
+-SRCS_MP3LIB-$(HAVE_ALTIVEC) += mp3lib/dct64_altivec.c
+-SRCS_MP3LIB-$(HAVE_MMX) += mp3lib/decode_mmx.c
+-SRCS_MP3LIB-$(HAVE_SSE) += mp3lib/dct64_sse.c
+-SRCS_MP3LIB += mp3lib/sr1.c \
+- $(SRCS_MP3LIB-yes)
+-SRCS_COMMON-$(MP3LIB) += libmpcodecs/ad_mp3lib.c \
+- $(SRCS_MP3LIB)
+-
+ SRCS_COMMON-$(MUSEPACK) += libmpcodecs/ad_mpc.c \
+ libmpdemux/demux_mpc.c
+ SRCS_COMMON-$(NATIVE_RTSP) += stream/stream_rtsp.c \
+@@ -578,7 +563,6 @@
+ loader/dshow \
+ loader/dmo \
+ loader/wine \
+- mp3lib \
+ osdep \
+ stream \
+ stream/freesdp \
+@@ -675,8 +659,6 @@
+ #loader/%: CFLAGS += -Ddbg_printf=__vprintf -DTRACE=__vprintf -DDETAILED_OUT
+ loader/win32%: CFLAGS += $(CFLAGS_STACKREALIGN)
+
+-mp3lib/decode_i586%: CFLAGS += -fomit-frame-pointer
+-
+ stream/stream_dvdnav%: CFLAGS := $(CFLAGS_LIBDVDNAV) $(CFLAGS)
+
+
+@@ -767,9 +749,7 @@
+ loader/qtx/list$(EXESUF) loader/qtx/qtxload$(EXESUF): CFLAGS += -g
+ loader/qtx/list$(EXESUF) loader/qtx/qtxload$(EXESUF): $(LOADER_TEST_OBJS)
+
+-mp3lib/test$(EXESUF) mp3lib/test2$(EXESUF): $(SRCS_MP3LIB:.c=.o) libvo/aclib.o cpudetect.o $(TEST_OBJS)
+-
+-TESTS = codecs2html codec-cfg-test libvo/aspecttest mp3lib/test mp3lib/test2
++TESTS = codecs2html codec-cfg-test libvo/aspecttest
+
+ ifdef ARCH_X86
+ TESTS += loader/qtx/list loader/qtx/qtxload
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-09 18:57:24 +0000