Blob Blame History Raw
diff -Naupr easytag-2.1.7.orig/configure easytag-2.1.7/configure
--- easytag-2.1.7.orig/configure	2012-01-15 10:25:33.000000000 +0100
+++ easytag-2.1.7/configure	2012-05-17 22:43:16.544316278 +0200
@@ -18276,7 +18276,7 @@ ac_config_headers="$ac_config_headers co
 
 
 
-ac_config_files="$ac_config_files Makefile easytag.spec doc/easytag.1 src/Makefile src/id3lib/Makefile src/libapetag/Makefile src/libmpg123/Makefile po/Makefile.in"
+ac_config_files="$ac_config_files Makefile easytag.spec doc/easytag.1 src/Makefile src/id3lib/Makefile src/libapetag/Makefile po/Makefile.in"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -19369,7 +19369,6 @@ do
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
     "src/id3lib/Makefile") CONFIG_FILES="$CONFIG_FILES src/id3lib/Makefile" ;;
     "src/libapetag/Makefile") CONFIG_FILES="$CONFIG_FILES src/libapetag/Makefile" ;;
-    "src/libmpg123/Makefile") CONFIG_FILES="$CONFIG_FILES src/libmpg123/Makefile" ;;
     "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
diff -Naupr easytag-2.1.7.orig/configure.in easytag-2.1.7/configure.in
--- easytag-2.1.7.orig/configure.in	2012-01-15 01:33:15.000000000 +0100
+++ easytag-2.1.7/configure.in	2012-05-17 22:43:16.545316069 +0200
@@ -475,7 +475,6 @@ AC_OUTPUT([ Makefile
             src/Makefile
             src/id3lib/Makefile
             src/libapetag/Makefile
-            src/libmpg123/Makefile
             po/Makefile.in
          ])
 
diff -Naupr easytag-2.1.7.orig/src/Makefile.in easytag-2.1.7/src/Makefile.in
--- easytag-2.1.7.orig/src/Makefile.in	2012-01-15 10:25:32.000000000 +0100
+++ easytag-2.1.7/src/Makefile.in	2012-05-17 22:43:16.547259443 +0200
@@ -61,7 +61,7 @@ am_easytag_OBJECTS = about.$(OBJEXT) ape
 	wavpack_tag.$(OBJEXT)
 easytag_OBJECTS = $(am_easytag_OBJECTS)
 am__DEPENDENCIES_1 =
-easytag_DEPENDENCIES = $(am__DEPENDENCIES_1) libmpg123/libmpg123.a \
+easytag_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	libapetag/libapetag.a id3lib/libid3bugfix.a
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -269,7 +269,7 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = libmpg123 libapetag id3lib
+SUBDIRS = libapetag id3lib
 easytag_SOURCES = \
  about.c \
  about.h \
@@ -351,7 +351,7 @@ EXTRA_DIST = \
  win32/nsis/easytag-install.ico \
  win32/nsis/easytag-uninstall.bmp 
 
-easytag_LDADD = $(GTK_LIBS) libmpg123/libmpg123.a libapetag/libapetag.a  id3lib/libid3bugfix.a
+easytag_LDADD = $(GTK_LIBS) libapetag/libapetag.a  id3lib/libid3bugfix.a
 PACKAGE_DATA_DIR = $(datadir)/$(PACKAGE)
 INCLUDES = -DLOCALEDIR=\"$(localedir)\" \
            -DPACKAGE_DATA_DIR=\"$(PACKAGE_DATA_DIR)\"
diff -Naupr easytag-2.1.7.orig/src/mpeg_header.c easytag-2.1.7/src/mpeg_header.c
--- easytag-2.1.7.orig/src/mpeg_header.c	2011-07-04 02:59:21.000000000 +0200
+++ easytag-2.1.7/src/mpeg_header.c	2012-05-17 22:43:16.548233444 +0200
@@ -36,7 +36,7 @@
 // Set to :
 // - 1 to use ID3lib for reading headers
 // - 0 to use mpeg123 for reading headers
-#define USE_ID3LIB_4_HEADER 0
+#define USE_ID3LIB_4_HEADER 1
 
 #if USE_ID3LIB_4_HEADER
 #   include <id3.h>