rpms/grip/devel grip-3.0.7-cdparanoia.patch, NONE, 1.1 grip-3.0.7-locking.patch, NONE, 1.1 grip-3.2.0-default.patch, NONE, 1.1 grip-3.2.0-rh1.patch, NONE, 1.1 grip.desktop, NONE, 1.1 grip.spec, NONE, 1.1 gripicon.png, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Adrian Reber (adrian)
fedora-extras-commits at redhat.com
Wed Mar 2 08:48:42 UTC 2005
Author: adrian
Update of /cvs/extras/rpms/grip/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3453/devel
Modified Files:
.cvsignore sources
Added Files:
grip-3.0.7-cdparanoia.patch grip-3.0.7-locking.patch
grip-3.2.0-default.patch grip-3.2.0-rh1.patch grip.desktop
grip.spec gripicon.png
Log Message:
auto-import grip-3.2.0-3 on branch devel from grip-3.2.0-3.src.rpm
grip-3.0.7-cdparanoia.patch:
--- NEW FILE grip-3.0.7-cdparanoia.patch ---
diff -ru grip-3.0.7/config.h.in grip-3.0.7-fixed/config.h.in
--- grip-3.0.7/config.h.in 2003-01-04 14:04:06.000000000 -0500
+++ grip-3.0.7-fixed/config.h.in 2003-08-18 20:33:19.000000000 -0400
@@ -38,10 +38,10 @@
#undef HAVE_ARGZ_H
/* Define to 1 if you have the <cdda_interface.h> header file. */
-#undef HAVE_CDDA_INTERFACE_H
+#undef HAVE_CDDA_CDDA_INTERFACE_H
/* Define to 1 if you have the <cdda_paranoia.h> header file. */
-#undef HAVE_CDDA_PARANOIA_H
+#undef HAVE_CDDA_CDDA_PARANOIA_H
/* Define to 1 if you have the `dcgettext' function. */
#undef HAVE_DCGETTEXT
diff -ru grip-3.0.7/configure.in grip-3.0.7-fixed/configure.in
--- grip-3.0.7/configure.in 2003-04-22 22:33:27.000000000 -0400
+++ grip-3.0.7-fixed/configure.in 2003-08-18 20:26:30.000000000 -0400
@@ -52,7 +52,7 @@
if test "$enable_cdpar" = "yes"; then
LIBS="$LIBS -lm"
- AC_CHECK_HEADERS(cdda_interface.h cdda_paranoia.h)
+ AC_CHECK_HEADERS(cdda/cdda_interface.h cdda/cdda_paranoia.h)
AC_CHECK_LIB(cdda_interface,main,
if test "$enable_shared_cdpar" = "yes"; then
echo "using shared cdparanoia libraries"
diff -ru grip-3.0.7/src/cdpar.c grip-3.0.7-fixed/src/cdpar.c
--- grip-3.0.7/src/cdpar.c 2003-01-04 14:04:08.000000000 -0500
+++ grip-3.0.7-fixed/src/cdpar.c 2003-08-18 20:34:33.000000000 -0400
@@ -25,7 +25,7 @@
#include "grip.h"
-#ifdef HAVE_CDDA_INTERFACE_H
+#ifdef HAVE_CDDA_CDDA_INTERFACE_H
#include <stdio.h>
#include <stdarg.h>
@@ -44,8 +44,8 @@
#define size16 short
#define size32 int
-#include <cdda_interface.h>
-#include <cdda_paranoia.h>
+#include <cdda/cdda_interface.h>
+#include <cdda/cdda_paranoia.h>
static void PutNum(long num,int f,int endianness,int bytes);
static void WriteWav(int f,long bytes);
diff -ru grip-3.0.7/src/grip.h grip-3.0.7-fixed/src/grip.h
--- grip-3.0.7/src/grip.h 2003-01-04 14:04:08.000000000 -0500
+++ grip-3.0.7-fixed/src/grip.h 2003-08-18 20:33:39.000000000 -0400
@@ -31,7 +31,7 @@
#include "pthread.h"
#include "launch.h"
-#ifdef HAVE_CDDA_INTERFACE_H
+#ifdef HAVE_CDDA_CDDA_INTERFACE_H
#define CDPAR
#endif
diff -ru grip-3.0.7/src/rip.c grip-3.0.7-fixed/src/rip.c
--- grip-3.0.7/src/rip.c 2003-01-11 18:00:00.000000000 -0500
+++ grip-3.0.7-fixed/src/rip.c 2003-08-18 20:43:11.000000000 -0400
@@ -50,8 +50,8 @@
#include "gain_analysis.h"
#define size32 gint32
#define size16 gint16
-#include <cdda_interface.h>
-#include <cdda_paranoia.h>
+#include <cdda/cdda_interface.h>
+#include <cdda/cdda_paranoia.h>
extern int rip_smile_level;
#endif
grip-3.0.7-locking.patch:
--- NEW FILE grip-3.0.7-locking.patch ---
diff -ru grip-3.0.7/src/rip.c grip-3.0.7-fixed/src/rip.c
--- grip-3.0.7/src/rip.c 2003-01-11 18:00:00.000000000 -0500
+++ grip-3.0.7-fixed/src/rip.c 2003-08-18 20:43:11.000000000 -0400
@@ -1220,6 +1220,10 @@
CDStop(&(ginfo->disc));
ginfo->stopped=TRUE;
+
+ /* Close the device so locking works sanely */
+ close(ginfo->disc.cd_desc);
+ ginfo->disc.cd_desc = -1;
if(ginfo->ripping) {
ginfo->doencode=FALSE;
grip-3.2.0-default.patch:
--- NEW FILE grip-3.2.0-default.patch ---
--- grip-3.2.0/src/gripcfg.c.rh-default-encoder 2004-04-15 20:20:15.000000000 +0200
+++ grip-3.2.0/src/gripcfg.c 2004-06-20 01:54:41.052531992 +0200
@@ -47,16 +47,16 @@
{"",""}
};
-static MP3Encoder encoder_defaults[]={{"bladeenc","-%b -QUIT %w %m","mp3"},
+static MP3Encoder encoder_defaults[]={{"oggenc",
+ "-o %m -a %a -l %d -t %n -b %b %w -N %t -G %g -d %y",
+ "ogg"},
+ {"bladeenc","-%b -QUIT %w %m"},
{"lame","-h -b %b %w %m","mp3"},
{"l3enc","-br %b %w %m","mp3"},
{"xingmp3enc","-B %b -Q %w","mp3"},
{"mp3encode","-p 2 -l 3 -b %b %w %m",
"mp3"},
{"gogo","-b %b %w %m","mp3"},
- {"oggenc",
- "-o %m -a %a -l %d -t %n -b %b %w -N %t -G %g -d %y",
- "ogg"},
{"flac","-V -o %m %w","flac"},
{"other","",""},
{"",""}
--- grip-3.2.0/src/grip.c.rh-default-encoder 2004-04-15 20:23:54.000000000 +0200
+++ grip-3.2.0/src/grip.c 2004-06-20 01:51:47.994840760 +0200
@@ -832,7 +832,7 @@
ginfo->using_builtin_cdp=FALSE;
#endif
ginfo->in_rip_thread=FALSE;
- strcpy(ginfo->ripfileformat,"~/mp3/%A/%d/%n.wav");
+ strcpy(ginfo->ripfileformat,"~/ogg/%A/%d/%n.wav");
#ifdef __linux__
FindExeInPath("cdparanoia", ginfo->ripexename, sizeof(ginfo->ripexename));
strcpy(ginfo->ripcmdline,"-d %c %t:[.%s]-%t:[.%e] %w");
@@ -856,9 +856,9 @@
*ginfo->wav_filter_cmd='\0';
*ginfo->disc_filter_cmd='\0';
ginfo->selected_encoder=1;
- strcpy(ginfo->mp3cmdline,"-h -b %b %w %m");
- FindExeInPath("lame", ginfo->mp3exename, sizeof(ginfo->mp3exename));
- strcpy(ginfo->mp3fileformat,"~/mp3/%A/%d/%n.%x");
+ strcpy(ginfo->mp3cmdline,"-o %m -a %a -l %d -t %n -N %t -G %G -d %y -q 4 %w");
+ FindExeInPath("oggenc", ginfo->mp3exename, sizeof(ginfo->mp3exename));
+ strcpy(ginfo->mp3fileformat,"~/ogg/%A/%d/%n.ogg");
strcpy(ginfo->mp3extension,"mp3");
ginfo->mp3nice=0;
*ginfo->mp3_filter_cmd='\0';
@@ -866,7 +866,7 @@
ginfo->add_to_db=FALSE;
ginfo->add_m3u=TRUE;
ginfo->rel_m3u=TRUE;
- strcpy(ginfo->m3ufileformat,"~/mp3/%A-%d.m3u");
+ strcpy(ginfo->m3ufileformat,"~/ogg/%A-%d.m3u");
ginfo->kbits_per_sec=128;
ginfo->edit_num_cpu=1;
ginfo->doid3=TRUE;
grip-3.2.0-rh1.patch:
--- NEW FILE grip-3.2.0-rh1.patch ---
--- grip-3.2.0/Makefile.in.rh1 2004-06-20 02:21:06.831456952 +0200
+++ grip-3.2.0/Makefile.in 2004-06-20 02:22:40.643195400 +0200
@@ -113,7 +113,7 @@
grip.spec.in
-Applicationsdir = $(datadir)/applications
+Applicationsdir = $(datadir)/gnome/apps/Multimedia
Applications_DATA = grip.desktop
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--- NEW FILE grip.desktop ---
[Desktop Entry]
Name=Grip
Name[ca]=Grip
Name[es]=Grip
Comment=CD player/ripper
Comment[ca]=Reproductor/extractor de CD d'audio
Comment[es]=Reproductor/extractor de CDs de audio
Comment[fr]=Lecteur/extracteur de CD audio
Exec=grip
Icon=gripicon.png
Type=Application
--- NEW FILE grip.spec ---
Summary: A front-end for CD rippers and Ogg Vorbis encoders.
Name: grip
Version: 3.2.0
Release: 3
Serial: 1
Copyright: GPL
Group: Applications/Multimedia
Source: http://www.nostatic/grip/%{name}-%{version}.tar.gz
Source1: gripicon.png
Source2: grip.desktop
Patch1: grip-3.2.0-default.patch
Patch2: grip-3.0.7-cdparanoia.patch
Patch3: grip-3.0.7-locking.patch
Patch4: grip-3.2.0-rh1.patch
URL: http://www.nostatic.org/grip
Buildroot: %{_tmppath}/%{name}-root
Requires: vorbis-tools
BuildPrereq: vte-devel cdparanoia-devel autoconf >= 2.52
BuildPrereq: libgnomeui-devel, curl-devel, desktop-file-utils
ExcludeArch: s390 s390x
%description
Grip is a GTK+ based front-end for CD rippers (such as cdparanoia and
cdda2wav) and Ogg Vorbis encoders. Grip allows you to rip entire tracks or
just a section of a track. Grip supports the CDDB protocol for
accessing track information on disc database servers.
%prep
%setup -q
%patch1 -p1 -b .rh-default-encoder
#%patch2 -p1 -b .cdparanoia
#%patch3 -p1 -b .locking
%patch4 -p1 -b .rh1
%build
autoconf
%configure
make
%install
rm -rf %{buildroot}
cp -f %{SOURCE2} .
make DESTDIR=$RPM_BUILD_ROOT install
make DESTDIR=$RPM_BUILD_ROOT install-am
install $RPM_SOURCE_DIR/gripicon.png %{buildroot}%{_datadir}/pixmaps
desktop-file-install \
--vendor=net \
--dir $RPM_BUILD_ROOT/%{_datadir}/applications \
--delete-original \
--add-category X-Red-Hat-Extra \
--add-category Application \
--add-category AudioVideo \
%{buildroot}%{_datadir}/gnome/apps/Multimedia/grip.desktop
cat >> %{buildroot}%{_datadir}/applications/net-grip.desktop << EOF
StartupWMClass=Grip
EOF
%find_lang %{name}-2.2
%clean
rm -rf %{buildroot}
%files -f %{name}-2.2.lang
%defattr(-,root,root)
%doc README ChangeLog CREDITS COPYING INSTALL NEWS AUTHORS TODO
%{_bindir}/grip
%{_datadir}/pixmaps/gripicon.png
%{_datadir}/gnome/help/grip
%{_datadir}/applications/*
%changelog
* Fri Oct 8 2004 Bill Nottingham <notting at redhat.com> 3.2.0-3
- add a passel of buildreqs (#135045)
* Wed Jul 28 2004 Adrian Havill <havill at redhat.com> 3.2.0-2
- rebuilt
- add vte-devel to BuildRequires
* Sun Jun 20 2004 Karsten Hopp <karsten at redhat.de> 3.2.0-1
- update to latest stable version
- remove obsolete locking and cdparanoia patches
* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt
* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt
* Mon Aug 18 2003 Bill Nottingham <notting at redhat.com> 1:3.0.7-3
- fix it so it actually uses cdparanoia libraries
- close the cd device before ripping so locking works (#102051)
* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
- rebuilt
* Thu May 29 2003 Bill Nottingham <notting at redhat.com> 1:3.0.7-1
- update to 3.0.7
* Tue Feb 18 2003 Bill Nottingham <notting at redhat.com> 1:3.0.4-5
- fix default encoder (#83647)
* Wed Feb 5 2003 Bill Nottingham <notting at redhat.com> 1:3.0.4-4
- desktop file fixing
* Wed Jan 29 2003 Bill Nottingham <notting at redhat.com> 1:3.0.4-3
- fix debuginfo-induced desktop file weirdness (#82905)
* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
- rebuilt
* Tue Jan 7 2003 Bill Nottingham <notting at redhat.com> 1:3.0.4-1
- update to 3.0.4
* Mon Dec 23 2002 Tim Powers <timp at redhat.com> 1:3.0.1-5
- bump and rebuild
* Thu Dec 12 2002 Tim Powers <timp at redhat.com> 1:3.0.1-4
- rebuild on all arches
* Wed Aug 21 2002 Bill Nottingham <notting at redhat.com> 3.0.1-4
- fix encode options (#72156)
* Mon Aug 19 2002 Bill Nottingham <notting at redhat.com> 3.0.1-3
- rebuild (#71899)
* Tue Jul 23 2002 Tim Powers <timp at redhat.com> 3.0.1-2
- build using gcc-3.2-0.1
* Mon Jun 24 2002 Bill Nottingham <notting at redhat.com> 3.0.1-1
- update to 3.0.1
* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
- automated rebuild
* Thu May 23 2002 Tim Powers <timp at redhat.com>
- automated rebuild
* Wed Apr 10 2002 Bill Nottingham <notting at redhat.com>
- fix default encoder opts (#62551)
* Wed Jul 18 2001 Bill Nottingham <notting at redhat.com>
- update to 2.96
* Mon May 21 2001 Tim Powers <timp at redhat.com>
- applied patches from alane at geeksrus.net in bug #41490
* Mon May 14 2001 Tim Powers <timp at redhat.com>
- updated to 2.95
- requires vorbis
- patched to use oggenc by default (since we ship it)
- changed location of the desktop file
* Wed Aug 9 2000 Tim Powers <timp at redhat.com>
- added Serial so that we can upgrade from the Helix packages for 6.2
* Mon Jul 24 2000 Prospector <prospector at redhat.com>
- rebuilt
* Wed Jul 12 2000 Than Ngo <than at redhat.de>
- rebuilt
* Fri Jun 16 2000 Preston Brown <pbrown at redhat.com>
- include icon properly
- fix up man path patch
* Wed Jun 7 2000 Tim Powers <timp at redhat.com>
- fixed manpage location
- use %%makeinstall and other predefined macros wherever possible
* Fri May 12 2000 Tim Powers <timp at redhat.com>
- updated to 2.94
* Sun Feb 06 2000 Preston Brown <pbrown at redhat.com>
- fix more problems w/man page because of gzip
* Sun Jan 16 2000 Preston Brown <pbrown at redhat.com>
- 2.91
- fix man page symlink
* Thu Nov 11 1999 Tim Powers <timp at redhat.com>
- updated to 2.8
- no longer need separate cdparanoia source
- gzip man pages
- added desktop entry
* Mon Aug 30 1999 Bill Nottingham <notting at redhat.com>
- update to 2.6
* Thu Jul 15 1999 Tim Powers <timp at redhat.com>
- updated grip source
- included cdparanoia source, builds during the build routine so
we can have a complete grip build
- and all were happy when it twas built for 6.1
* Sat Apr 18 1999 Michael Maher <mike at redhat.com>
- built package for 6.0
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/grip/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 2 Mar 2005 08:47:33 -0000 1.1
+++ .cvsignore 2 Mar 2005 08:48:40 -0000 1.2
@@ -0,0 +1 @@
+grip-3.2.0.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grip/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 2 Mar 2005 08:47:33 -0000 1.1
+++ sources 2 Mar 2005 08:48:40 -0000 1.2
@@ -0,0 +1 @@
+9b51933a03dd7d7ddfbb3643fc82c2d0 grip-3.2.0.tar.gz
More information about the fedora-extras-commits
mailing list