diff options
| author | James Meyer <james.meyer@operamail.com> | 2009-08-01 03:14:54 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2009-08-01 03:14:54 (GMT) |
| commit | 7b35632e80f168d8c5f2220bf610ee7e24b81270 (patch) | |
| tree | 8facf3fa565911f056a08e38f6a5eed0f756f9c6 /abs/core-testing/mythtv/trunk/mythmusic | |
| parent | 7e10f51870aa10be3b35d7912a7b54e30f608bb8 (diff) | |
| parent | 7accc0f042acdfdca9f067b1d4011d6ac01b1a74 (diff) | |
| download | linhes_pkgbuild-7b35632e80f168d8c5f2220bf610ee7e24b81270.zip linhes_pkgbuild-7b35632e80f168d8c5f2220bf610ee7e24b81270.tar.gz linhes_pkgbuild-7b35632e80f168d8c5f2220bf610ee7e24b81270.tar.bz2 | |
Merge branch 'HEAD' of ssh://jams@knoppmyth.net/mount/repository/LinHES-PKGBUILD
Conflicts:
abs/core-testing/LinHES-config/PKGBUILD
Diffstat (limited to 'abs/core-testing/mythtv/trunk/mythmusic')
| -rw-r--r-- | abs/core-testing/mythtv/trunk/mythmusic/PKGBUILD | 4 | ||||
| -rw-r--r-- | abs/core-testing/mythtv/trunk/mythmusic/aacdecoder.cpp.patch | 12 |
2 files changed, 2 insertions, 14 deletions
diff --git a/abs/core-testing/mythtv/trunk/mythmusic/PKGBUILD b/abs/core-testing/mythtv/trunk/mythmusic/PKGBUILD index 912fa54..743872c 100644 --- a/abs/core-testing/mythtv/trunk/mythmusic/PKGBUILD +++ b/abs/core-testing/mythtv/trunk/mythmusic/PKGBUILD @@ -1,5 +1,5 @@ pkgname=mythmusic-svn -pkgver=20787 +pkgver=21022 pkgrel=1 pkgdesc="Music playing plugin for MythTV" url="http://www.mythtv.org" @@ -12,7 +12,7 @@ depends=('mythtv-svn' 'libid3tag' 'libmad' 'libvorbis' 'flac>=1.1.4' 'libcdaudio conflicts=('mythmusic') groups=('mythtv-extras-svn') -patches=('aacdecoder.cpp.patch') +patches=() source=(`echo ${patches[@]:0}`) _svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins _svnmod=mythplugins diff --git a/abs/core-testing/mythtv/trunk/mythmusic/aacdecoder.cpp.patch b/abs/core-testing/mythtv/trunk/mythmusic/aacdecoder.cpp.patch deleted file mode 100644 index 8796eb4..0000000 --- a/abs/core-testing/mythtv/trunk/mythmusic/aacdecoder.cpp.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- mythmusic/mythmusic/aacdecoder.cpp.orig 2008-11-19 12:51:48.000000000 -0500 -+++ mythmusic/mythmusic/aacdecoder.cpp 2008-11-19 12:52:42.000000000 -0500 -@@ -17,6 +17,9 @@ - #define FAAD_MODIFIED - #endif - -+// LinHES need this undefined -+#undef FAAD_MODIFIED -+ - // ANSI C headers - #include <cstdlib> - |