rpms/easytag/FC-6 easytag-2.0.1-id3lib.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 easytag.spec, 1.17, 1.18 sources, 1.7, 1.8 easytag-1.99.13-id3lib.patch, 1.1, NONE
Matthias Saou (thias)
fedora-extras-commits at redhat.com
Fri Apr 20 08:30:32 UTC 2007
- Previous message: comps comps-f7.xml.in,1.163,1.164
- Next message: rpms/easytag/devel easytag-2.0.1-id3lib.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 easytag.spec, 1.18, 1.19 sources, 1.7, 1.8 easytag-1.99.13-id3lib.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: thias
Update of /cvs/extras/rpms/easytag/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4762/FC-6
Modified Files:
.cvsignore easytag.spec sources
Added Files:
easytag-2.0.1-id3lib.patch
Removed Files:
easytag-1.99.13-id3lib.patch
Log Message:
Update to 2.0.1.
easytag-2.0.1-id3lib.patch:
--- NEW FILE easytag-2.0.1-id3lib.patch ---
diff -Naupr easytag-2.0.1.orig/configure easytag-2.0.1/configure
--- easytag-2.0.1.orig/configure 2007-04-12 23:33:38.000000000 +0200
+++ easytag-2.0.1/configure 2007-04-20 10:18:39.000000000 +0200
@@ -24586,7 +24586,7 @@ echo "${ECHO_T}$LINGUAS" >&6
- 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
# tests run on this system so they can be shared between configure
@@ -25157,7 +25157,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" ;;
"depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
diff -Naupr easytag-2.0.1.orig/configure.in easytag-2.0.1/configure.in
--- easytag-2.0.1.orig/configure.in 2007-04-12 23:31:49.000000000 +0200
+++ easytag-2.0.1/configure.in 2007-04-20 10:18:39.000000000 +0200
@@ -356,7 +356,6 @@ AC_OUTPUT([ Makefile
src/Makefile
src/id3lib/Makefile
src/libapetag/Makefile
- src/libmpg123/Makefile
po/Makefile.in
])
diff -Naupr easytag-2.0.1.orig/configure.in.orig easytag-2.0.1/configure.in.orig
--- easytag-2.0.1.orig/configure.in.orig 1970-01-01 01:00:00.000000000 +0100
+++ easytag-2.0.1/configure.in.orig 2007-04-12 23:31:49.000000000 +0200
@@ -0,0 +1,383 @@
+dnl Process this file with autoconf to produce a configure script.
+dnl AC_INIT(src/easytag.h)
+
+AC_PREREQ(2.53)
+
+AC_INIT(easytag, 2.0.1) dnl defines ($PACKAGE, $VERSION) - To set also in config.h.mingw
+
+AC_CONFIG_SRCDIR(src/easytag.h)
+dnl -------------------------------
+dnl Init automake
+dnl -------------------------------
+AM_INIT_AUTOMAKE(foreign)
+
+dnl -------------------------------
+dnl Translation files
+dnl -------------------------------
+ALL_LINGUAS="bg cs da de el es fr hu it ja nl pl pt_BR ro ru sv uk zh_CN"
+GETTEXT_PACKAGE=easytag
+AC_SUBST(GETTEXT_PACKAGE)
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Package name for gettext])
+
+dnl -------------------------------
+dnl Checks for programs.
+dnl -------------------------------
+AC_PROG_CC
+AC_PROG_CXX
+AC_PROG_CXXCPP
+AC_PROG_INSTALL
+AC_PROG_MAKE_SET
+AC_DISABLE_SHARED
+AC_PROG_LIBTOOL
+AC_ISC_POSIX
+AM_MAINTAINER_MODE
+
+
+dnl -------------------------------
+dnl Configure switches.
+dnl -------------------------------
+AC_ARG_ENABLE(mp3,
+ AC_HELP_STRING([--disable-mp3], [Disable support for MP3 files (default=enabled)]),
+ , enable_mp3=yes)
+
+AC_ARG_ENABLE(ogg,
+ AC_HELP_STRING([--disable-ogg], [Disable support for Ogg Vorbis files (default=enabled)]),
+ , enable_ogg=yes)
+
+AC_ARG_ENABLE(flac,
+ AC_HELP_STRING([--disable-flac],[Disable support for FLAC files (default=enabled)]),
+ , enable_flac=yes)
+
+AC_ARG_ENABLE(mp4,
+ AC_HELP_STRING([--disable-mp4],[Disable support for MP4 files (default=enabled)]),
+ , enable_mp4=yes)
+
+AC_ARG_ENABLE(wavpack,
+ AC_HELP_STRING([--disable-wavpack],[Disable support for Wavpack files (default=enabled)]),
+ , enable_wavpack=yes)
+
+
+dnl -------------------------------
+dnl Checks for libraries.
+dnl -------------------------------
+
+dnl GTK+-2.0 libraries
+AM_PATH_GLIB_2_0(2.4.1,, AC_MSG_ERROR([*** GLIB >= 2.4.1 not installed! ***]))
+AM_PATH_GTK_2_0(2.4.1,, AC_MSG_ERROR([*** GTK >= 2.4.1 not installed! ***]))
+PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.4.1 glib-2.0 >= 2.4.1)
+
+
+dnl Get rid of unnecessary and even erroneous compiler options
+CFLAGS="`echo $CFLAGS|sed -e 's%\-I/usr/include%%g' -e 's%\-L/usr/lib%%g'`"
+
+
+dnl ################################################
+dnl # Ogg Vorbis librairies (rq : needed also for libFLAC)
+dnl ################################################
+dnl XIPH_PATH_OGG(enable_ogg="yes",enable_ogg="no")
+
+if test "x$enable_ogg" = "xyes" -o "x$enable_flac" = "xyes"; then
+ AC_CHECK_LIB(m, cos) dnl Patch from Christian Weisgerber
+ AC_CHECK_LIB(ogg, ogg_sync_init, , ogg_available=no)
+ AC_CHECK_LIB(vorbis, vorbis_comment_init, , ogg_available=no)
+ AC_CHECK_LIB(vorbisfile, ov_open, , ogg_available=no)
+fi
+
+AC_MSG_CHECKING(for Ogg Vorbis file support)
+if test "x$enable_ogg" = "xyes"; then
+ if test "x$ogg_available" = "xno"; then
+ AC_MSG_RESULT(no)
+ enable_ogg="no"
+ echo "***"
+ echo "*** Warning: Ogg Vorbis file support disabled"
+ echo "*** (Install libogg and libvorbis libraries to enable it)"
+ echo "***"
+ else
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(ENABLE_OGG,1,[Define for Ogg Vorbis support])
+ fi
+else
+ echo "***"
+ echo "*** Ogg Vorbis file support disabled on commandline"
+ echo "*** (Install libogg and libvorbis libraries, and use --enable-ogg to enable it)"
+ echo "***"
+fi
+
+
+dnl ################################################
+dnl # libFLAC library
+dnl ################################################
+dnl check for system libflac
+dnl Note that libvorbis is required for flac support, even if the user chooses --disable-ogg
+
+if test "x$enable_flac" = "xyes"; then
+ dnl Library required for flac files, if not found 'enable_flac' is disabled
+ AC_CHECK_LIB(m, cos) dnl Patch from Christian Weisgerber
+ AC_CHECK_LIB(FLAC, FLAC__metadata_simple_iterator_new, , flac_available=no)
+
+ AC_MSG_CHECKING(for FLAC file support)
+ if test "x$flac_available" = "xno"; then
+ AC_MSG_RESULT(no)
+ enable_flac="no"
+ echo "***"
+ echo "*** Warning: FLAC file support disabled, libflac missing"
+ echo "*** (Install libflac, libogg and libvorbis libraries to enable it)"
+ echo "***"
+ elif test "x$ogg_available" = "xno"; then
+ AC_MSG_RESULT(no)
+ enable_flac="no"
+ echo "***"
+ echo "*** Warning: FLAC file support disabled, libvorbis missing"
+ echo "*** (Install libflac, libogg and libvorbis libraries to enable it)"
+ echo "***"
+ else
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(ENABLE_FLAC,1,[Define for FLAC support])
+ fi
+else
+ AC_MSG_CHECKING(for FLAC file support)
+ AC_MSG_RESULT(no)
+ echo "***"
+ echo "*** FLAC file support disabled on commandline"
+ echo "*** (Install libflac, libogg and libvorbis libraries, and use --enable-flac to enable it)"
+ echo "***"
+fi
+
+dnl Check version of libFLAC installed
+dnl version of libFLAC must be at least 1.1.0
+if test "x$enable_flac" = "xyes"; then
+ LIBS_SAVE="$LIBS"
+ CFLAGS_SAVE="$CFLAGS"
+ LIBS="$LIBS $LIBFLAC_LIBS"
+ CFLAGS="$CFLAGS $LIBFLAC_CFLAGS"
+ AC_MSG_CHECKING(for libFLAC version)
+ AC_TRY_RUN([
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <FLAC/format.h>
+int
+main (void)
+{
+ FILE *output;
+ char tmp[16];
+ int libflac_major, libflac_minor, libflac_patch;
[...27368 lines suppressed...]
+ ETFileInfo->duration = mpg123_get_song_time(file)/1000;
+ //g_print("time %s\n",Convert_Duration(ETFileInfo->duration));
+
+ fclose(file);
+ }else
+ {
+ gchar *filename_utf8 = filename_to_display(filename);
+ Log_Print(_("ERROR while opening file: '%s' (%s).\a"),filename_utf8,g_strerror(errno));
+ g_free(filename_utf8);
+ return FALSE;
+ }
+
+#else
+ // Needs to uncomment some #include at the beginning
+
+ /*
+ * With id3lib, the header frame couldn't be read if the file contains an ID3v2 tag with an APIC frame
+ */
+ gulong filesize;
+ ID3Tag *id3_tag = NULL; /* Tag defined by the id3lib */
+ const Mp3_Headerinfo* headerInfo = NULL;
+
+
+ if (!filename || !ETFileInfo)
+ return FALSE;
+
+ /* Get size of file */
+ filesize = Get_File_Size(filename);
+ ETFileInfo->size = filesize;
+
+ /* Get data from tag */
+ if ( (id3_tag = ID3Tag_New()) == NULL )
+ return FALSE;
+
+ /* Link the file to the tag (uses ID3TT_ID3V2 to get header if APIC is present in Tag) */
+ ID3Tag_LinkWithFlags(id3_tag,filename,ID3TT_ID3V2);
+
+ /*ID3_STRUCT(Mp3_Headerinfo)
+ {
+ Mpeg_Layers layer;
+ Mpeg_Version version;
+ MP3_BitRates bitrate;
+ Mp3_ChannelMode channelmode;
+ Mp3_ModeExt modeext;
+ Mp3_Emphasis emphasis;
+ Mp3_Crc crc;
+ uint32 vbr_bitrate; // avg bitrate from xing header
+ uint32 frequency; // samplerate
+ uint32 framesize;
+ uint32 frames; // nr of frames
+ uint32 time; // nr of seconds in song
+ bool privatebit;
+ bool copyrighted;
+ bool original;
+ };*/
+
+ if ( (headerInfo = ID3Tag_GetMp3HeaderInfo(id3_tag)) )
+ {
+ switch (headerInfo->version)
+ {
+ case MPEGVERSION_1:
+ ETFileInfo->version = 1;
+ ETFileInfo->mpeg25 = FALSE;
+ break;
+ case MPEGVERSION_2:
+ ETFileInfo->version = 2;
+ ETFileInfo->mpeg25 = FALSE;
+ break;
+ case MPEGVERSION_2_5:
+ ETFileInfo->mpeg25 = TRUE;
+ ETFileInfo->mpeg25 = FALSE;
+ break;
+ default:
+ break;
+ }
+
+ switch (headerInfo->layer)
+ {
+ case MPEGLAYER_I:
+ ETFileInfo->layer = 1;
+ break;
+ case MPEGLAYER_II:
+ ETFileInfo->layer = 2;
+ break;
+ case MPEGLAYER_III:
+ ETFileInfo->layer = 3;
+ break;
+ default:
+ break;
+ }
+
+ // Samplerate
+ ETFileInfo->samplerate = headerInfo->frequency;
+
+ // Mode -> Seems to be detected but incorrect?!
+ switch (headerInfo->modeext)
+ {
+ case MP3CHANNELMODE_STEREO:
+ ETFileInfo->mode = 0;
+ break;
+ case MP3CHANNELMODE_JOINT_STEREO:
+ ETFileInfo->mode = 1;
+ break;
+ case MP3CHANNELMODE_DUAL_CHANNEL:
+ ETFileInfo->mode = 2;
+ break;
+ case MP3CHANNELMODE_SINGLE_CHANNEL:
+ ETFileInfo->mode = 3;
+ break;
+ default:
+ break;
+ }
+
+ // Bitrate
+ if (headerInfo->vbr_bitrate <= 0)
+ {
+ ETFileInfo->variable_bitrate = FALSE;
+ ETFileInfo->bitrate = headerInfo->bitrate/1000;
+ }else
+ {
+ ETFileInfo->variable_bitrate = TRUE;
+ ETFileInfo->bitrate = headerInfo->vbr_bitrate/1000;
+ }
+
+ // Duration
+ ETFileInfo->duration = headerInfo->time;
+ }
+
+ /* Free allocated data */
+ ID3Tag_Delete(id3_tag);
+
+#endif
+
+ return TRUE;
+}
+
+
+
+/*
+ * Display header infos in the main window
+ */
+gboolean Mpeg_Header_Display_File_Info_To_UI(gchar *filename_utf8, ET_File_Info *ETFileInfo)
+{
+ gchar *text;
+ gchar *time = NULL;
+ gchar *time1 = NULL;
+ gchar *size = NULL;
+ gchar *size1 = NULL;
+ gint ln_num = sizeof(layer_names)/sizeof(layer_names[0]);
+
+
+ /* MPEG, Layer versions */
+ gtk_label_set_text(GTK_LABEL(VersionLabel),_("MPEG"));
+ ln_num = sizeof(layer_names)/sizeof(layer_names[0]); // Used to avoid problem with layer_names[]
+ if (ETFileInfo->mpeg25)
+ text = g_strdup_printf("2.5, Layer %s",(ETFileInfo->layer>=1 && ETFileInfo->layer<=ln_num)?layer_names[ETFileInfo->layer-1]:"?");
+ else
+ text = g_strdup_printf("%d, Layer %s",ETFileInfo->version,(ETFileInfo->layer>=1 && ETFileInfo->layer<=ln_num)?layer_names[ETFileInfo->layer-1]:"?");
+ gtk_label_set_text(GTK_LABEL(VersionValueLabel),text);
+ g_free(text);
+
+ /* Bitrate */
+ if (ETFileInfo->variable_bitrate)
+ text = g_strdup_printf(_("~%d kb/s"),ETFileInfo->bitrate);
+ else
+ text = g_strdup_printf(_("%d kb/s"),ETFileInfo->bitrate);
+ gtk_label_set_text(GTK_LABEL(BitrateValueLabel),text);
+ g_free(text);
+
+ /* Samplerate */
+ text = g_strdup_printf(_("%d Hz"),ETFileInfo->samplerate);
+ gtk_label_set_text(GTK_LABEL(SampleRateValueLabel),text);
+ g_free(text);
+
+ /* Mode */
+ gtk_label_set_text(GTK_LABEL(ModeLabel),_("Mode:"));
+ text = g_strdup_printf("%s",_(channel_mode_name(ETFileInfo->mode)));
+ gtk_label_set_text(GTK_LABEL(ModeValueLabel),text);
+ g_free(text);
+
+ /* Size */
+ size = Convert_Size(ETFileInfo->size);
+ size1 = Convert_Size(ETCore->ETFileDisplayedList_TotalSize);
+ text = g_strdup_printf("%s (%s)",size,size1);
+ gtk_label_set_text(GTK_LABEL(SizeValueLabel),text);
+ g_free(size);
+ g_free(size1);
+ g_free(text);
+
+ /* Duration */
+ time = Convert_Duration(ETFileInfo->duration);
+ time1 = Convert_Duration(ETCore->ETFileDisplayedList_TotalDuration);
+ text = g_strdup_printf("%s (%s)",time,time1);
+ gtk_label_set_text(GTK_LABEL(DurationValueLabel),text);
+ g_free(time);
+ g_free(time1);
+ g_free(text);
+
+ return TRUE;
+}
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/easytag/FC-6/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 1 Mar 2007 12:20:02 -0000 1.7
+++ .cvsignore 20 Apr 2007 08:29:56 -0000 1.8
@@ -1 +1 @@
-easytag-2.0-patched.tar.bz2
+easytag-2.0.1-patched.tar.bz2
Index: easytag.spec
===================================================================
RCS file: /cvs/extras/rpms/easytag/FC-6/easytag.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- easytag.spec 1 Mar 2007 12:20:02 -0000 1.17
+++ easytag.spec 20 Apr 2007 08:29:56 -0000 1.18
@@ -1,6 +1,6 @@
Summary: Tag editor for mp3, ogg, flac and other music files
Name: easytag
-Version: 2.0
+Version: 2.0.1
Release: 1%{?dist}
License: GPL
Group: Applications/Multimedia
@@ -11,10 +11,11 @@
# 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-1.99.13-id3lib.patch
+Patch0: easytag-2.0.1-id3lib.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, gettext
+BuildRequires: libvorbis-devel >= 1.0, flac-devel, libmp4v2-devel, wavpack-devel
+BuildRequires: gettext
%description
EasyTAG is a utility for viewing, editing and writing the tags of MP3,
@@ -55,6 +56,11 @@
%changelog
+* Fri Apr 20 2007 Matthias Saou <http://freshrpms.net/> 2.0.1-1
+- Update to 2.0.1.
+- Update id3lib patch (Makefile.mingw changes).
+- Include new wavpack support.
+
* Thu Mar 1 2007 Matthias Saou <http://freshrpms.net/> 2.0-1
- Update to 2.0.
- Remove now included APE tag patch.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/easytag/FC-6/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 1 Mar 2007 12:20:02 -0000 1.7
+++ sources 20 Apr 2007 08:29:56 -0000 1.8
@@ -1 +1 @@
-3419d58afaf7108c3129c57005537998 easytag-2.0-patched.tar.bz2
+7de62588d38694f5ba4adf4ecd5876dc easytag-2.0.1-patched.tar.bz2
--- easytag-1.99.13-id3lib.patch DELETED ---
- Previous message: comps comps-f7.xml.in,1.163,1.164
- Next message: rpms/easytag/devel easytag-2.0.1-id3lib.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 easytag.spec, 1.18, 1.19 sources, 1.7, 1.8 easytag-1.99.13-id3lib.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list