diff options
| author | Vlad Glagolev | 2009-08-31 04:48:11 +0400 |
|---|---|---|
| committer | Vlad Glagolev | 2009-08-31 04:48:11 +0400 |
| commit | 70fc1551d3d7444a7348da0cd86d2daab81031ca (patch) | |
| tree | 485aa516a45f36f6c1bd4de94a3697aab701e1b0 | |
| parent | a9c60cb94ada5c49d6eacac4d4cbcc00ef9f0016 (diff) | |
faad2: fixed AAC files/streams playing by disabling non-working DRM support
| -rwxr-xr-x | audio-libs/faad2/BUILD | 4 | ||||
| -rwxr-xr-x | audio-libs/faad2/DETAILS | 1 | ||||
| -rw-r--r-- | audio-libs/faad2/HISTORY | 7 | ||||
| -rwxr-xr-x | audio-libs/faad2/PRE_BUILD | 1 | ||||
| -rw-r--r-- | audio-libs/faad2/faad2-enable-drm.patch | 14 |
5 files changed, 8 insertions, 19 deletions
diff --git a/audio-libs/faad2/BUILD b/audio-libs/faad2/BUILD index d11202db27..2ec1a388b4 100755 --- a/audio-libs/faad2/BUILD +++ b/audio-libs/faad2/BUILD @@ -1,7 +1,3 @@ -if [ "$FAAD_CVS" = "y" ]; then - OPTS="$OPTS --with-drm" -fi && -OPTS="$OPTS --with-mp4v2" && if [ "$XMMS" != "y" ]; then OPTS="$OPTS --without-xmms" fi && diff --git a/audio-libs/faad2/DETAILS b/audio-libs/faad2/DETAILS index 7fb51bafb7..2b0c5c0689 100755 --- a/audio-libs/faad2/DETAILS +++ b/audio-libs/faad2/DETAILS @@ -12,6 +12,7 @@ if [ "$FAAD_CVS" = "y" ]; then SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-cvs else VERSION=2.7 + PATCHLEVEL=1 SOURCE_HASH=sha512:8135370497dfcfee09094a03a4a9545ebc58b9e532b89c5d6e5037042549e12ddb75f8903aa05866afac9fa28df96320f1ed2eebffc0660578e54392a51c1161 SOURCE=$SPELL-$VERSION.tar.gz SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION diff --git a/audio-libs/faad2/HISTORY b/audio-libs/faad2/HISTORY index 4dfebc3e57..a48cd71ef2 100644 --- a/audio-libs/faad2/HISTORY +++ b/audio-libs/faad2/HISTORY @@ -1,3 +1,10 @@ +2009-08-31 Vlad Glagolev <stealth@sourcemage.org> + * DETAILS: PATCHLEVEL=1 + * BUILD: removed non-existent flag and drm flag + * PRE_BUILD: removed patch-applying + * faad2-enable-drm.patch: removed, don't force drm support since it's + _broken_ + 2009-03-05 Jaka Kranjc <lynxlynxlynx@sourcemage.org> * UP_TRIGGERS: detect the latest soname change too diff --git a/audio-libs/faad2/PRE_BUILD b/audio-libs/faad2/PRE_BUILD index df60ff8137..1a8d4c1fa4 100755 --- a/audio-libs/faad2/PRE_BUILD +++ b/audio-libs/faad2/PRE_BUILD @@ -1,5 +1,4 @@ default_pre_build && cd $SOURCE_DIRECTORY && -patch -p1 < ${SCRIPT_DIRECTORY}/faad2-enable-drm.patch && sedit 's/^AC_PROG_CPP$/AC_PROG_CXX/' configure.in && /bin/sh ./bootstrap diff --git a/audio-libs/faad2/faad2-enable-drm.patch b/audio-libs/faad2/faad2-enable-drm.patch deleted file mode 100644 index c34c1311b7..0000000000 --- a/audio-libs/faad2/faad2-enable-drm.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur faad2.orig/libfaad/common.h faad2/libfaad/common.h ---- faad2.orig/libfaad/common.h 2004-10-22 21:01:54.841786248 +0200 -+++ faad2/libfaad/common.h 2004-10-22 21:05:19.927576554 +0200 -@@ -80,8 +80,8 @@ - /* Allow decoding of scalable profiles */ - //#define SCALABLE_DEC - /* Allow decoding of Digital Radio Mondiale (DRM) */ --//#define DRM --//#define DRM_PS -+#define DRM -+#define DRM_PS - - /* LD can't do without LTP */ - #ifdef LD_DEC |