Remove libid3tag from contribs

diff --git a/extras/contrib/src/Distributions/beos.mak b/extras/contrib/src/Distributions/beos.mak
index 4eb9ff59fc59b26c1c1163b8be021bb9f77b4529..7b6451ee3ed8e8855289a1b4a9c72db69eb92ac2 100644 (file)
--- a/extras/contrib/src/Distributions/beos.mak
+++ b/extras/contrib/src/Distributions/beos.mak
@@ -2,7 +2,7 @@
 ifeq ($(HOST),$(BUILD))
 # Native build: we need perl, autoconf, etc first
 all: .perl .autoconf .automake .libtool .iconv .intl .freetype .fribidi \
-       .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
+       .a52 .mpeg2 .mad .ogg .vorbis .vorbisenc .theora \
        .flac .speex .faad .lame .ebml .matroska .ffmpeg .dvdcss \
        .dvdnav .dvbpsi .dca .aclocal
    #.speex seems
@@ -10,7 +10,7 @@ else
 # Cross compiling: we already have the Linux tools, only build the
 # libraries now
 all: .iconv .intl .freetype .fribidi \
-       .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
+       .a52 .mpeg2 .mad .ogg .vorbis .vorbisenc .theora \
        .flac .faad .faac .lame .twolame .ebml .matroska .ffmpeg .dvdcss \
        .dvdnav .dvbpsi .dca .aclocal
 endif

diff --git a/extras/contrib/src/Distributions/darwin.mak b/extras/contrib/src/Distributions/darwin.mak
index 13478f670de6cca53a2e8143edd6f9bfbded813d..d093c357af8d0ad24130605d5495cdf6c9725e74 100644 (file)
--- a/extras/contrib/src/Distributions/darwin.mak
+++ b/extras/contrib/src/Distributions/darwin.mak
@@ -1,6 +1,6 @@
 # Darwin rules
 all: .autoconf .gnumake .automake .libtool .intl .pkgcfg .yasm .freetype \
-    .fribidi .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
+    .fribidi .a52 .mpeg2 .mad .ogg .vorbis .vorbisenc .theora \
     .flac .speex .shout .faad .lame .twolame .ebml .matroska .ffmpeg \
     .dvdcss .libdvdread .dvdnav .dvbpsi .live .caca .mod .fontconfig \
     .png .gpg-error .gcrypt .gnutls .cddb .cdio .vcdimager \

diff --git a/extras/contrib/src/Distributions/darwin64.mak b/extras/contrib/src/Distributions/darwin64.mak
index 019e0ffc79c68d77f0f1c14195572355409c26d3..d147a4f43d8ebffe6c455aee0c61c1c368de7f33 100644 (file)
--- a/extras/contrib/src/Distributions/darwin64.mak
+++ b/extras/contrib/src/Distributions/darwin64.mak
@@ -1,6 +1,6 @@
 # Darwin rules
 all: .autoconf .gnumake .automake .libtool .intl .pkgcfg .yasm .freetype \
-    .fribidi .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
+    .fribidi .a52 .mpeg2 .mad .ogg .vorbis .vorbisenc .theora \
     .flac .speex .shout .faad .lame .twolame .ebml .matroska .ffmpeg \
     .dvdcss .libdvdread .dvdnav .dvbpsi .live .caca .mod .fontconfig \
     .png .jpeg .tiff .gpg-error .gcrypt .gnutls .cddb .cdio .vcdimager \

diff --git a/extras/contrib/src/Distributions/debian.mak b/extras/contrib/src/Distributions/debian.mak
index 0b1eed85c8fd95e403956e2e649c71837366ba90..268fb1d6458af38994732e977c7c33066241e5c7 100644 (file)
--- a/extras/contrib/src/Distributions/debian.mak
+++ b/extras/contrib/src/Distributions/debian.mak
@@ -1,6 +1,6 @@
 # Debian Linux
 all: .iconv .intl .freetype .fribidi .zlib \
-       .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
+       .a52 .mpeg2 .mad .ogg .vorbis .vorbisenc .theora \
        .flac .speex .faad .lame .ebml .matroska .ffmpeg .dvdcss \
        .live .goom2k4 .caca .mod .x264  .xml .twolame \
        .png .gpg-error .gcrypt .gnutls .mpcdec \

diff --git a/extras/contrib/src/Distributions/fedora.mak b/extras/contrib/src/Distributions/fedora.mak
index 30325bd91bfa1a6d1701f6dc32bbc2ada67269bd..e437fc1f466cb6160e9110abfe4ccc84cd5c6eb8 100644 (file)
--- a/extras/contrib/src/Distributions/fedora.mak
+++ b/extras/contrib/src/Distributions/fedora.mak
@@ -1,6 +1,6 @@
 # Fedora Linux rules
 # Most dependencies are available from livna repro.
-all: .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
+all: .a52 .mpeg2 .mad .ogg .vorbis .vorbisenc .theora \
        .flac .speex .faad .lame .ebml .matroska .ffmpeg \
        .live .goom2k4 .caca .mod .x264  .xml .twolame \
        .mpcdec \

diff --git a/extras/contrib/src/Distributions/unix.mak b/extras/contrib/src/Distributions/unix.mak
index 942aea11e0fc9b29a918a62a49ed148d9169e3f2..8a553ab1f303ca019cf55a2920e85c5176030841 100644 (file)
--- a/extras/contrib/src/Distributions/unix.mak
+++ b/extras/contrib/src/Distributions/unix.mak
@@ -1,6 +1,6 @@
 # Standard Linux or other UNIX-like systems
 all: .iconv .intl .freetype .fribidi .zlib \
-       .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
+       .a52 .mpeg2 .mad .ogg .vorbis .vorbisenc .theora \
        .flac .speex .faad  .lame .ebml .matroska .ffmpeg .dvdcss \
        .live .goom2k4 .caca .mod .x264  .xml .twolame \
        .png .gpg-error .gcrypt .gnutls .mpcdec \

diff --git a/extras/contrib/src/Distributions/win32.mak b/extras/contrib/src/Distributions/win32.mak
index cea223b849656aaf6e4c4a575a7fdc822777edd1..bc2c33839cb73fbb4c9863607af60533c45e12f5 100644 (file)
--- a/extras/contrib/src/Distributions/win32.mak
+++ b/extras/contrib/src/Distributions/win32.mak
@@ -1,6 +1,6 @@
 # WIN32 rules
 all: .iconv .intl .freetype .fribidi .zlib \
-        .a52 .mpeg2 .id3tag .mad .ogg .vorbis .shout .vorbisenc .theora \
+        .a52 .mpeg2 .mad .ogg .vorbis .shout .vorbisenc .theora \
         .flac .speex .faad .lame .ebml  .matroska .ffmpeg .dvdcss \
         .live .pthreads .goom2k4 .caca .mod .x264  .xml .twolame \
         .png .gpg-error .gcrypt .gnutls .mpcdec .dirac .schroedinger \

diff --git a/extras/contrib/src/Distributions/win64.mak b/extras/contrib/src/Distributions/win64.mak
index 3a03b9f32a9ce2240f3a2ce54d78418993173685..42e5cc0720e6df06ae14820ad6104fd530b524d1 100644 (file)
--- a/extras/contrib/src/Distributions/win64.mak
+++ b/extras/contrib/src/Distributions/win64.mak
@@ -1,6 +1,6 @@
 # WIN32 rules
 all: .iconv .intl .freetype .fribidi .zlib \
-        .a52 .mpeg2 .id3tag .mad .ogg .vorbis .shout .vorbisenc .theora \
+        .a52 .mpeg2 .mad .ogg .vorbis .shout .vorbisenc .theora \
         .flac .speex .faad .lame .ebml  .matroska .ffmpeg .dvdcss \
         .live .goom2k4 .caca .mod .x264  .xml .twolame \
         .png .gpg-error .gcrypt .gnutls .mpcdec \

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index ff8eab463daeac1879878cfb4b85dc00c23a5c09..3525c74713be0fc40f76e4d5706b5f8f80ae0f40 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -573,29 +573,6 @@ CLEAN_FILE += .mpeg2
 CLEAN_PKG += libmpeg2
 DISTCLEAN_PKG += libmpeg2-$(LIBMPEG2_VERSION).tar.gz
 
-# ***************************************************************************
-# libid3tag
-# ***************************************************************************
-
-libid3tag-$(LIBID3TAG_VERSION).tar.gz:
-       $(WGET) $(LIBID3TAG_URL)
-
-libid3tag: libid3tag-$(LIBID3TAG_VERSION).tar.gz
-       $(EXTRACT_GZ)
-       patch -d libid3tag -p0 < Patches/libid3tag-0.15.1b-fix-CVE-2008-2109.patch
-ifdef HAVE_DARWIN_OS
-       ( cd $@; sed -e 's%-dynamiclib%-dynamiclib -arch $(ARCH)%' -i.orig  configure )
-endif
-
-.id3tag: libid3tag
-       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
-       $(INSTALL_NAME)
-       touch $@
-
-CLEAN_FILE += .id3tag
-CLEAN_PKG += libid3tag
-DISTCLEAN_PKG += libid3tag-$(LIBID3TAG_VERSION).tar.gz
-
 # ***************************************************************************
 # pcre
 # ***************************************************************************

diff --git a/extras/contrib/src/Patches/libid3tag-0.15.1b-fix-CVE-2008-2109.patch b/extras/contrib/src/Patches/libid3tag-0.15.1b-fix-CVE-2008-2109.patch
deleted file mode 100644 (file)
index 7e0b003..0000000
--- a/extras/contrib/src/Patches/libid3tag-0.15.1b-fix-CVE-2008-2109.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-*** field.c    2003-04-19 09:14:33.000000000 +0900
---- field-patched.c    2008-01-13 16:08:22.000000000 +0900
-***************
-*** 291,297 ****
-
-        end = *ptr + length;
-
-!       while (end - *ptr > 0) {
-       ucs4 = id3_parse_string(ptr, end - *ptr, *encoding, 0);
-       if (ucs4 == 0)
-         goto fail;
---- 291,297 ----
-
-        end = *ptr + length;
-
-!       while (end - *ptr > 0 && **ptr != '\0') {
-       ucs4 = id3_parse_string(ptr, end - *ptr, *encoding, 0);
-       if (ucs4 == 0)
-         goto fail;

diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index d064dc22fd150bfa6203dc2e33a226a72f3d0d31..1a2676ae025027b3a43ef4d0ea1fbd96a9fdcd26 100644 (file)
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -64,8 +64,6 @@ A52DEC_VERSION=0.7.4
 A52DEC_URL=$(CONTRIB_VIDEOLAN)/a52dec-$(A52DEC_VERSION).tar.gz
 LIBMPEG2_VERSION=0.5.1
 LIBMPEG2_URL=http://libmpeg2.sourceforge.net/files/libmpeg2-$(LIBMPEG2_VERSION).tar.gz
-LIBID3TAG_VERSION=0.15.1b
-LIBID3TAG_URL=$(CONTRIB_VIDEOLAN)/libid3tag-$(LIBID3TAG_VERSION).tar.gz
 LIBMAD_VERSION=0.15.1b
 LIBMAD_URL=$(CONTRIB_VIDEOLAN)/libmad-$(LIBMAD_VERSION).tar.gz
 OGG_VERSION=1.2.0