From: Rémi Denis-Courmont Date: Mon, 19 Jul 2010 20:24:21 +0000 (+0300) Subject: Remove libid3tag from contribs X-Git-Tag: 1.2.0-pre1~5749 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=2046250142e380c8f3238aeaaae3e6c1b6765757;p=vlc Remove libid3tag from contribs --- diff --git a/extras/contrib/src/Distributions/beos.mak b/extras/contrib/src/Distributions/beos.mak index 4eb9ff59fc..7b6451ee3e 100644 --- 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 13478f670d..d093c357af 100644 --- 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 019e0ffc79..d147a4f43d 100644 --- 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 0b1eed85c8..268fb1d645 100644 --- 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 30325bd91b..e437fc1f46 100644 --- 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 942aea11e0..8a553ab1f3 100644 --- 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 cea223b849..bc2c33839c 100644 --- 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 3a03b9f32a..42e5cc0720 100644 --- 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 ff8eab463d..3525c74713 100644 --- 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 index 7e0b0033fb..0000000000 --- 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 d064dc22fd..1a2676ae02 100644 --- 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