rpms/easytag/devel easytag-2.1.6-cddb_manual_search_fix.patch, NONE, 1.1 easytag-2.1.6-id3lib.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 easytag.spec, 1.26, 1.27 sources, 1.9, 1.10 easytag-2.0.1-id3lib.patch, 1.1, NONE easytag-2.1-ru-hint.asp.patch, 1.1, NONE

Matthias Saou thias at fedoraproject.org
Sat Sep 12 14:59:50 UTC 2009 

Author: thias

Update of /cvs/extras/rpms/easytag/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1655

Modified Files:
	.cvsignore easytag.spec sources 
Added Files:
	easytag-2.1.6-cddb_manual_search_fix.patch 
	easytag-2.1.6-id3lib.patch 
Removed Files:
	easytag-2.0.1-id3lib.patch easytag-2.1-ru-hint.asp.patch 
Log Message:
Update to 2.1.6.


easytag-2.1.6-cddb_manual_search_fix.patch:
 cddb.c |  117 ++++++++++++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 80 insertions(+), 37 deletions(-)

--- NEW FILE easytag-2.1.6-cddb_manual_search_fix.patch ---
diff -ruN easytag-2.1.6.orig/src/cddb.c easytag-2.1.6/src/cddb.c
--- easytag-2.1.6.orig/src/cddb.c	2008-03-22 22:57:29.000000000 +0100
+++ easytag-2.1.6/src/cddb.c	2009-08-25 23:16:35.000000000 +0200
@@ -2158,10 +2158,12 @@
  */
 gboolean Cddb_Search_Album_List_From_String (void)
 {
-    if ( strstr(CDDB_SERVER_NAME_MANUAL_SEARCH,"freedb") != NULL )
-        return Cddb_Search_Album_List_From_String_Freedb();
-    else
+    if ( strstr(CDDB_SERVER_NAME_MANUAL_SEARCH,"gnudb") != NULL )
+		// Use of gnudb
         return Cddb_Search_Album_List_From_String_Gnudb();
+    else
+		// Use of freedb
+        return Cddb_Search_Album_List_From_String_Freedb();
 }
 
 
@@ -2255,7 +2257,7 @@
     g_free(string);
     g_free(tmp);
     g_free(proxy_auth);
-    //g_print("Request : '%s'\n", cddb_in);
+    //g_print("Request Cddb_Search_Album_List_From_String_Freedb : '%s'\n", cddb_in);
 
     // Send the request
     gtk_statusbar_push(GTK_STATUSBAR(CddbStatusBar),CddbStatusBarContext,_("Sending request ..."));
@@ -2574,7 +2576,7 @@
                                   );
         next_page_found = FALSE;
         g_free(proxy_auth);
-        //g_print("Request : '%s'\n", cddb_in);
+        //g_print("Request Cddb_Search_Album_List_From_String_Gnudb : '%s'\n", cddb_in);
 
         // Send the request
         gtk_statusbar_push(GTK_STATUSBAR(CddbStatusBar),CddbStatusBarContext,_("Sending request ..."));
@@ -3130,7 +3132,7 @@
                                       (proxy_auth=Cddb_Format_Proxy_Authentification())
                                       );
             g_free(proxy_auth);
-            //g_print("Request : '%s'\n", cddb_in);
+            //g_print("Request Cddb_Search_Album_From_Selected_Files : '%s'\n", cddb_in);
 
             msg = g_strdup_printf(_("Sending request (CddbId: %s, #tracks: %d, Disc length: %d) ..."),
                                 cddb_discid,num_tracks,disc_length);
@@ -3394,24 +3396,47 @@
                                              CDDB_USE_PROXY?CDDB_PROXY_PORT:cddb_server_port)) <= 0 )
             return FALSE;
 
-        // CDDB Request (ex: GET /~cddb/cddb.cgi?cmd=cddb+read+jazz+0200a401&hello=noname+localhost+EasyTAG+0.31&proto=1 HTTP/1.1\r\nHost: freedb.freedb.org:80\r\nConnection: close)
-        // Without proxy : "GET /~cddb/cddb.cgi?..." but doesn't work with a proxy.
-        // With proxy    : "GET http://freedb.freedb.org/~cddb/cddb.cgi?..."
-        cddb_in = g_strdup_printf("GET %s%s%s?cmd=cddb+read+"
-                                  "%s+%s"
-                                  "&hello=noname+localhost+%s+%s"
-                                  "&proto=6 HTTP/1.1\r\n"
-                                  "Host: %s:%d\r\n"
-                                  "%s"
-                                  "Connection: close\r\n\r\n",
-                                  CDDB_USE_PROXY?"http://":"",CDDB_USE_PROXY?cddb_server_name:"", cddb_server_cgi_path,
-                                  cddbalbum->category,cddbalbum->id,
-                                  APPNAME,VERSION,
-                                  cddb_server_name,cddb_server_port,
-                                  (proxy_auth=Cddb_Format_Proxy_Authentification())
-                                  );
-        g_free(proxy_auth);
-        //g_print("Request : '%s'\n", cddb_in);
+		if ( strstr(cddb_server_name,"gnudb") != NULL )
+		{
+			// For gnudb
+			// New version of gnudb doesn't use a cddb request, but a http request
+		    cddb_in = g_strdup_printf("GET %s%s/gnudb/"
+		                              "%s/%s"
+		                              " HTTP/1.1\r\n"
+		                              "Host: %s:%d\r\n"
+		                              "User-Agent: %s %s\r\n"
+		                              "%s"
+		                              "Connection: close\r\n"
+		                              "\r\n",
+		                              CDDB_USE_PROXY?"http://":"", CDDB_USE_PROXY?cddb_server_name:"",  // Needed when using proxy
+		                              cddbalbum->category,cddbalbum->id,
+		                              cddb_server_name,cddb_server_port,
+		                              APPNAME,VERSION,
+		                              (proxy_auth=Cddb_Format_Proxy_Authentification())
+		                              );
+		}else
+		{
+		    // CDDB Request (ex: GET /~cddb/cddb.cgi?cmd=cddb+read+jazz+0200a401&hello=noname+localhost+EasyTAG+0.31&proto=1 HTTP/1.1\r\nHost: freedb.freedb.org:80\r\nConnection: close)
+		    // Without proxy : "GET /~cddb/cddb.cgi?..." but doesn't work with a proxy.
+		    // With proxy    : "GET http://freedb.freedb.org/~cddb/cddb.cgi?..."
+		    cddb_in = g_strdup_printf("GET %s%s%s?cmd=cddb+read+"
+		                              "%s+%s"
+		                              "&hello=noname+localhost+%s+%s"
+		                              "&proto=6 HTTP/1.1\r\n"
+		                              "Host: %s:%d\r\n"
+		                              "%s"
+		                              "Connection: close\r\n\r\n",
+		                              CDDB_USE_PROXY?"http://":"",CDDB_USE_PROXY?cddb_server_name:"", cddb_server_cgi_path,
+		                              cddbalbum->category,cddbalbum->id,
+		                              APPNAME,VERSION,
+		                              cddb_server_name,cddb_server_port,
+		                              (proxy_auth=Cddb_Format_Proxy_Authentification())
+		                              );
+		}
+
+		
+		g_free(proxy_auth);
+        //g_print("Request Cddb_Get_Album_Tracks_List : '%s'\n", cddb_in);
 
         // Send the request
         gtk_statusbar_push(GTK_STATUSBAR(CddbStatusBar),CddbStatusBarContext,_("Sending request ..."));
@@ -3444,20 +3469,38 @@
         }
 
 
-        // Parse server answer : Check HTTP Header and CDDB Header
+        // Parse server answer : Check HTTP Header (freedb or gnudb) and CDDB Header (freedb only)
         file = NULL;
-        if ( Cddb_Read_Http_Header(&file,&cddb_out) <= 0
-          || Cddb_Read_Cddb_Header(&file,&cddb_out) <= 0 )
-        {
-            gchar *msg = g_strdup_printf(_("The server returned a wrong answer! (%s)"),cddb_out);
-            gtk_statusbar_push(GTK_STATUSBAR(CddbStatusBar),CddbStatusBarContext,msg);
-            Log_Print(LOG_ERROR,"%s",msg);
-            g_free(msg);
-            g_free(cddb_out);
-            if (file)
-                fclose(file);
-            return FALSE;
-        }
+		if ( strstr(cddb_server_name,"gnudb") != NULL )
+		{
+			// For gnudb (don't check CDDB header)
+			if ( Cddb_Read_Http_Header(&file,&cddb_out) <= 0 )
+		    {
+		        gchar *msg = g_strdup_printf(_("The server returned a wrong answer! (%s)"),cddb_out);
+		        gtk_statusbar_push(GTK_STATUSBAR(CddbStatusBar),CddbStatusBarContext,msg);
+		        Log_Print(LOG_ERROR,"%s",msg);
+		        g_free(msg);
+		        g_free(cddb_out);
+		        if (file)
+		            fclose(file);
+		        return FALSE;
+		    }
+		}else
+		{
+			// For freedb
+			if ( Cddb_Read_Http_Header(&file,&cddb_out) <= 0
+		      || Cddb_Read_Cddb_Header(&file,&cddb_out) <= 0 )
+		    {
+		        gchar *msg = g_strdup_printf(_("The server returned a wrong answer! (%s)"),cddb_out);
+		        gtk_statusbar_push(GTK_STATUSBAR(CddbStatusBar),CddbStatusBarContext,msg);
+		        Log_Print(LOG_ERROR,"%s",msg);
+		        g_free(msg);
+		        g_free(cddb_out);
+		        if (file)
+		            fclose(file);
+		        return FALSE;
+		    }
+		}
         g_free(cddb_out);
 
     }

easytag-2.1.6-id3lib.patch:
 configure         |    3 +--
 configure.in      |    1 -
 src/Makefile.in   |    6 +++---
 src/mpeg_header.c |    2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

--- NEW FILE easytag-2.1.6-id3lib.patch ---
diff -Naupr easytag-2.1.6.orig/configure easytag-2.1.6/configure
--- easytag-2.1.6.orig/configure	2008-07-12 16:57:44.000000000 +0200
+++ easytag-2.1.6/configure	2009-09-12 16:47:34.117176630 +0200
@@ -26034,7 +26034,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
@@ -26637,7 +26637,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" ;;
 
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
diff -Naupr easytag-2.1.6.orig/configure.in easytag-2.1.6/configure.in
--- easytag-2.1.6.orig/configure.in	2008-05-07 22:45:32.000000000 +0200
+++ easytag-2.1.6/configure.in	2009-09-12 16:47:42.421053700 +0200
@@ -473,7 +473,6 @@ AC_OUTPUT([ Makefile
             src/Makefile
             src/id3lib/Makefile
             src/libapetag/Makefile
-            src/libmpg123/Makefile
             po/Makefile.in
          ])
 
diff -Naupr easytag-2.1.6.orig/src/Makefile.in easytag-2.1.6/src/Makefile.in
--- easytag-2.1.6.orig/src/Makefile.in	2008-07-12 16:57:43.000000000 +0200
+++ easytag-2.1.6/src/Makefile.in	2009-09-12 16:48:30.102176910 +0200
@@ -59,7 +59,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. -I$(top_builddir)@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -226,7 +226,7 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = libmpg123 libapetag id3lib
+SUBDIRS = libapetag id3lib
 easytag_SOURCES = \
  about.c \
  about.h \
@@ -308,7 +308,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.6.orig/src/mpeg_header.c easytag-2.1.6/src/mpeg_header.c
--- easytag-2.1.6.orig/src/mpeg_header.c	2007-11-28 09:54:27.000000000 +0100
+++ easytag-2.1.6/src/mpeg_header.c	2009-09-12 16:48:50.266129581 +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>


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/easytag/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	15 Jun 2007 16:37:24 -0000	1.9
+++ .cvsignore	12 Sep 2009 14:59:47 -0000	1.10
@@ -1 +1 @@
-easytag-2.1-patched.tar.bz2
+easytag-2.1.6-patched.tar.bz2


Index: easytag.spec
===================================================================
RCS file: /cvs/extras/rpms/easytag/devel/easytag.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- easytag.spec	24 Jul 2009 20:46:33 -0000	1.26
+++ easytag.spec	12 Sep 2009 14:59:47 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: Tag editor for mp3, ogg, flac and other music files
 Name: easytag
-Version: 2.1
-Release: 7%{?dist}
+Version: 2.1.6
+Release: 1%{?dist}
 # Program is GPL only the included libapetag is LGPL
 License: GPLv2+ and LGPLv2+
 Group: Applications/Multimedia
@@ -12,8 +12,8 @@ URL: http://easytag.sourceforge.net/
 # rm -rf easytag-$VERSION/src/libmpg123/
 # tar --numeric-owner -cjvf easytag-$VERSION-patched.tar.bz2 easytag-$VERSION
 Source: easytag-%{version}-patched.tar.bz2
-Patch0: easytag-2.0.1-id3lib.patch
-Patch1: easytag-2.1-ru-hint.asp.patch
+Patch0: easytag-2.1.6-id3lib.patch
+Patch1: easytag-2.1.6-cddb_manual_search_fix.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gtk2-devel >= 2.4.0, id3lib-devel >= 3.7.12
 BuildRequires: libvorbis-devel >= 1.0, flac-devel, libmp4v2-devel, wavpack-devel
@@ -27,6 +27,7 @@ MP2, FLAC, Ogg Vorbis, MusePack and Monk
 %prep
 %setup -q
 %patch0 -p1 -b .id3lib
+%patch1 -p1 -b .cddb_manual_search_fix
 # With 2.0, the upstream tarball set *LOTS* of files +x :-(
 find . -type f -exec %{__chmod} -x {} \;
 %{__chmod} +x *.sh configure depcomp install-sh missing mkinstalldirs
@@ -58,6 +59,10 @@ find . -type f -exec %{__chmod} -x {} \;
 
 
 %changelog
+* Sat Sep 12 2009 Matthias Saou <http://freshrpms.net/> 2.1.6-1
+- Update to 2.1.6 : Development, but the latest for over a year now.
+- Include upstream cddb_manual_search_fix patch.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/easytag/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	15 Jun 2007 16:37:24 -0000	1.9
+++ sources	12 Sep 2009 14:59:47 -0000	1.10
@@ -1 +1 @@
-2fe02aacaf58537d0a9ac7288b21edea  easytag-2.1-patched.tar.bz2
+7a79e256449a0641a0a3a4f1b61ed3e0  easytag-2.1.6-patched.tar.bz2


--- easytag-2.0.1-id3lib.patch DELETED ---


--- easytag-2.1-ru-hint.asp.patch DELETED ---

More information about the fedora-extras-commits mailing list