September 2008 - rpmfusion-commits

rpms/gltron/F-8 gltron-0.70-gcc.patch, NONE, 1.1 gltron.desktop, NONE, 1.1 gltron.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

by jwrdegoede

Author: jwrdegoede Update of /cvs/free/rpms/gltron/F-8 In directory se02.es.rpmfusion.net:/tmp/cvs-serv25998 Modified Files: .cvsignore sources Added Files: gltron-0.70-gcc.patch gltron.desktop gltron.spec Log Message: * Sat Sep 27 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.70-4 - Fix rpm %patch symantics change builderror gltron-0.70-gcc.patch: --- NEW FILE gltron-0.70-gcc.patch --- --- nebu/include/scripting/nebu_scripting.h~ 2006-11-26 07:04:10.000000000 -0800 +++ nebu/include/scripting/nebu_scripting.h 2006-11-26 07:04:19.000000000 -0800 @@ -18,9 +18,9 @@ extern int scripting_CopyStringResult(char *s, int len); -extern void scripting_RunFile(const char *name); -extern void scripting_Run(const char *command); -extern void scripting_RunFormat(const char *format, ...); +extern void scripting_RunFile(char *name); +extern void scripting_Run(char *command); +extern void scripting_RunFormat(char *format, ...); extern void scripting_RunGC(); extern void scripting_Register(const char *name, int(*func) (lua_State *L)); --- NEW FILE gltron.desktop --- [Desktop Entry] Name=GLTron Comment=A game inspired by the movie TRON Exec=gltron Icon=gltron.png Terminal=false Type=Application Encoding=UTF-8 Categories=Application;Game;ArcadeGame; --- NEW FILE gltron.spec --- Name: gltron Version: 0.70 Release: 4%{?dist} Summary: A 3D game inspired by the movie TRON Group: Amusements/Games License: GPL URL: http://gltron.org Source0: http://dl.sf.net/gltron/gltron-0.70-source.tar.gz Source1: %{name}.desktop Source2: %{name}.png Patch0: gltron-0.70-gcc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL_sound-devel libpng-devel zlib-devel libGLU-devel BuildRequires: desktop-file-utils %description %{summary}. %prep %setup -q %patch0 -p0 -b .gcc~ %build %configure --disable-warn make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_datadir}/pixmaps desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications \ --vendor livna --mode=0644 --add-category=X-Livna %{SOURCE1} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYING ChangeLog README %{_bindir}/* %{_datadir}/%{name} %{_datadir}/applications/*.desktop %{_datadir}/pixmaps/*.png %changelog * Sat Sep 27 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.70-4 - Fix rpm %%patch symantics change builderror * Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.70-3 - rebuild * Sun Nov 26 2006 Christopher Stone <chris.stone(a)gmail.com> 0.70-2 - Remove more unneeded BuildRequires * Sun Nov 26 2006 Christopher Stone <chris.stone(a)gmail.com> 0.70-1 - Upstream sync - Fix License tag - Remove punctuation from Summary tag - Remove unnecessary BR - Some minor cleanups to spec file - Remove CFLAGS patch - Add --disable-warn to %%configure - Add a gcc compile patch * Sat Mar 25 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.70.0.3.beta.1 - fix BR * Wed Mar 22 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.70.0.2.beta.1 - remove epoch - fix release line * Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - add dist * Wed Nov 19 2003 Panu Matilainen <pmatilai(a)welho.com> 0.70-0.lvn.0.1.beta.1 - oops, release tag not right... * Fri Nov 14 2003 Panu Matilainen <pmatilai(a)welho.com> 0.70-0.lvn.0.beta.1 - patch to honor RPM_OPT_FLAGS and remove -Werror causing build to fail * Thu Nov 13 2003 Panu Matilainen <pmatilai(a)welho.com> - Initial livna.org packaging. Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/gltron/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 22 Jul 2008 16:50:46 -0000 1.1 +++ .cvsignore 27 Sep 2008 19:02:53 -0000 1.2 @@ -0,0 +1,2 @@ +gltron-0.70-source.tar.gz +gltron.png Index: sources =================================================================== RCS file: /cvs/free/rpms/gltron/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 22 Jul 2008 16:50:46 -0000 1.1 +++ sources 27 Sep 2008 19:02:53 -0000 1.2 @@ -0,0 +1,2 @@ +300e54914844f36c199415d6d8b0372a gltron-0.70-source.tar.gz +54a0506b072b38a0fdfb1718cecf97aa gltron.png

16 years, 2 months

1
0
0 / 0

rpms/gltron/F-9 gltron-0.70-gcc.patch, NONE, 1.1 gltron.desktop, NONE, 1.1 gltron.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

by jwrdegoede

Author: jwrdegoede Update of /cvs/free/rpms/gltron/F-9 In directory se02.es.rpmfusion.net:/tmp/cvs-serv25962 Modified Files: .cvsignore sources Added Files: gltron-0.70-gcc.patch gltron.desktop gltron.spec Log Message: * Sat Sep 27 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.70-4 - Fix rpm %patch symantics change builderror gltron-0.70-gcc.patch: --- NEW FILE gltron-0.70-gcc.patch --- --- nebu/include/scripting/nebu_scripting.h~ 2006-11-26 07:04:10.000000000 -0800 +++ nebu/include/scripting/nebu_scripting.h 2006-11-26 07:04:19.000000000 -0800 @@ -18,9 +18,9 @@ extern int scripting_CopyStringResult(char *s, int len); -extern void scripting_RunFile(const char *name); -extern void scripting_Run(const char *command); -extern void scripting_RunFormat(const char *format, ...); +extern void scripting_RunFile(char *name); +extern void scripting_Run(char *command); +extern void scripting_RunFormat(char *format, ...); extern void scripting_RunGC(); extern void scripting_Register(const char *name, int(*func) (lua_State *L)); --- NEW FILE gltron.desktop --- [Desktop Entry] Name=GLTron Comment=A game inspired by the movie TRON Exec=gltron Icon=gltron.png Terminal=false Type=Application Encoding=UTF-8 Categories=Application;Game;ArcadeGame; --- NEW FILE gltron.spec --- Name: gltron Version: 0.70 Release: 4%{?dist} Summary: A 3D game inspired by the movie TRON Group: Amusements/Games License: GPL URL: http://gltron.org Source0: http://dl.sf.net/gltron/gltron-0.70-source.tar.gz Source1: %{name}.desktop Source2: %{name}.png Patch0: gltron-0.70-gcc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL_sound-devel libpng-devel zlib-devel libGLU-devel BuildRequires: desktop-file-utils %description %{summary}. %prep %setup -q %patch0 -p0 -b .gcc~ %build %configure --disable-warn make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_datadir}/pixmaps desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications \ --vendor livna --mode=0644 --add-category=X-Livna %{SOURCE1} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYING ChangeLog README %{_bindir}/* %{_datadir}/%{name} %{_datadir}/applications/*.desktop %{_datadir}/pixmaps/*.png %changelog * Sat Sep 27 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.70-4 - Fix rpm %%patch symantics change builderror * Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.70-3 - rebuild * Sun Nov 26 2006 Christopher Stone <chris.stone(a)gmail.com> 0.70-2 - Remove more unneeded BuildRequires * Sun Nov 26 2006 Christopher Stone <chris.stone(a)gmail.com> 0.70-1 - Upstream sync - Fix License tag - Remove punctuation from Summary tag - Remove unnecessary BR - Some minor cleanups to spec file - Remove CFLAGS patch - Add --disable-warn to %%configure - Add a gcc compile patch * Sat Mar 25 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.70.0.3.beta.1 - fix BR * Wed Mar 22 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.70.0.2.beta.1 - remove epoch - fix release line * Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - add dist * Wed Nov 19 2003 Panu Matilainen <pmatilai(a)welho.com> 0.70-0.lvn.0.1.beta.1 - oops, release tag not right... * Fri Nov 14 2003 Panu Matilainen <pmatilai(a)welho.com> 0.70-0.lvn.0.beta.1 - patch to honor RPM_OPT_FLAGS and remove -Werror causing build to fail * Thu Nov 13 2003 Panu Matilainen <pmatilai(a)welho.com> - Initial livna.org packaging. Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/gltron/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 22 Jul 2008 16:50:46 -0000 1.1 +++ .cvsignore 27 Sep 2008 19:02:51 -0000 1.2 @@ -0,0 +1,2 @@ +gltron-0.70-source.tar.gz +gltron.png Index: sources =================================================================== RCS file: /cvs/free/rpms/gltron/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 22 Jul 2008 16:50:46 -0000 1.1 +++ sources 27 Sep 2008 19:02:51 -0000 1.2 @@ -0,0 +1,2 @@ +300e54914844f36c199415d6d8b0372a gltron-0.70-source.tar.gz +54a0506b072b38a0fdfb1718cecf97aa gltron.png

16 years, 2 months

1
0
0 / 0

rpms/gltron/devel gltron.spec,1.1,1.2

by jwrdegoede

Author: jwrdegoede Update of /cvs/free/rpms/gltron/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv25811 Modified Files: gltron.spec Log Message: * Sat Sep 27 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.70-4 - Fix rpm %patch symantics change builderror Index: gltron.spec =================================================================== RCS file: /cvs/free/rpms/gltron/devel/gltron.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gltron.spec 3 Aug 2008 14:27:34 -0000 1.1 +++ gltron.spec 27 Sep 2008 18:59:57 -0000 1.2 @@ -1,6 +1,6 @@ Name: gltron Version: 0.70 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A 3D game inspired by the movie TRON Group: Amusements/Games License: GPL @@ -19,7 +19,7 @@ %prep %setup -q -%patch -p0 -b .gcc~ +%patch0 -p0 -b .gcc~ %build %configure --disable-warn @@ -47,6 +47,9 @@ %{_datadir}/pixmaps/*.png %changelog +* Sat Sep 27 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.70-4 +- Fix rpm %%patch symantics change builderror + * Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.70-3 - rebuild

16 years, 2 months

1
0
0 / 0

rpms/comical/F-9 comical-0.8-jpe.patch, NONE, 1.1 comical-0.8-optflags.patch, NONE, 1.1 comical-0.8-wxicon.patch, NONE, 1.1 comical.desktop, NONE, 1.1 comical.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

by jwrdegoede

Author: jwrdegoede Update of /cvs/free/rpms/comical/F-9 In directory se02.es.rpmfusion.net:/tmp/cvs-serv25310 Modified Files: .cvsignore sources Added Files: comical-0.8-jpe.patch comical-0.8-optflags.patch comical-0.8-wxicon.patch comical.desktop comical.spec Log Message: * Sat Sep 27 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.8-6 - Fix building with latest wxWidgets comical-0.8-jpe.patch: --- NEW FILE comical-0.8-jpe.patch --- --- comical-0.8/src/ComicBookZIP.cpp.BAD 2006-04-24 20:41:07.000000000 -0500 +++ comical-0.8/src/ComicBookZIP.cpp 2006-04-24 20:41:30.000000000 -0500 @@ -54,7 +54,7 @@ do { unzGetCurrentFileInfo(ZipFile, fileInfo, namebuf, 1024, NULL, 0, NULL, 0); page = wxString::FromAscii(namebuf); - if(page.Right(5).Upper() == wxT(".JPEG") || page.Right(4).Upper() == wxT(".JPG") || + if(page.Right(5).Upper() == wxT(".JPEG") || page.Right(4).Upper() == wxT(".JPG") || page.Right(4).Upper() == wxT(".JPE") || page.Right(4).Upper() == wxT(".GIF") || page.Right(4).Upper() == wxT(".PNG")) Filenames->Add(page); --- comical-0.8/src/ComicBookRAR.cpp.BAD 2006-04-24 20:41:56.000000000 -0500 +++ comical-0.8/src/ComicBookRAR.cpp 2006-04-24 20:42:15.000000000 -0500 @@ -67,7 +67,7 @@ #else page = wxString(header.FileName); #endif - if(page.Right(5).Upper() == wxT(".JPEG") || page.Right(4).Upper() == wxT(".JPG") || + if(page.Right(5).Upper() == wxT(".JPEG") || page.Right(4).Upper() == wxT(".JPG") || page.Right(4).Upper() == wxT(".JPE") || page.Right(4).Upper() == wxT(".GIF") || page.Right(4).Upper() == wxT(".PNG")) Filenames->Add(page); comical-0.8-optflags.patch: --- NEW FILE comical-0.8-optflags.patch --- --- comical-0.8/unrar/makefile.linux.BAD 2006-02-11 10:15:09.000000000 -0600 +++ comical-0.8/unrar/makefile.linux 2006-04-24 20:43:10.000000000 -0500 @@ -7,7 +7,7 @@ # Linux using GCC CXX=g++ -CXXFLAGS=-O2 -fPIC +CXXFLAGS=-O2 -fPIC $(RPM_OPT_FLAGS) DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE STRIP=strip AR=ar --- comical-0.8/src/Makefile.BAD 2006-04-24 20:44:53.000000000 -0500 +++ comical-0.8/src/Makefile 2006-04-24 20:45:04.000000000 -0500 @@ -1,5 +1,5 @@ INCLUDE = -I../unrar -I../unzip -CFLAGS = -O2 -Wall -pipe +CFLAGS = -O2 -Wall -pipe $(RPM_OPT_FLAGS) CPPFLAGS = `wx-config --cxxflags` $(CFLAGS) -D_UNIX $(INCLUDE) .SUFFIXES: .cpp .png .h .d .o comical-0.8-wxicon.patch: --- NEW FILE comical-0.8-wxicon.patch --- diff -up comical-0.8/src/ComicalApp.cpp~ comical-0.8/src/ComicalApp.cpp --- comical-0.8/src/ComicalApp.cpp~ 2008-09-27 20:48:34.000000000 +0200 +++ comical-0.8/src/ComicalApp.cpp 2008-09-27 20:48:34.000000000 +0200 @@ -25,6 +25,7 @@ * * ***************************************************************************/ +#include <wx/icon.h> #include "ComicalApp.h" #include "ComicalFrame.h" #include <wx/log.h> --- NEW FILE comical.desktop --- [Desktop Entry] Encoding=UTF-8 Name=Comical GenericName=Comic Archive Reader Comment=Open .cbr & .cbz files Exec=comical Icon=comical.png StartupNotify=false Terminal=false Type=Application Categories=Application;Graphics;X-Livna; Version=0.9.4 X-Desktop-File-Install-Version=0.4 --- NEW FILE comical.spec --- Name: comical Version: 0.8 Release: 6%{?dist} Summary: GUI comic book viewer License: GPLv2 Group: Applications/Multimedia URL: http://comical.sourceforge.net/ Source0: http://download.sourceforge.net/comical/comical-%{version}.tar.gz Source1: comical.png Source2: comical.desktop Patch0: comical-0.8-jpe.patch Patch1: comical-0.8-optflags.patch Patch2: comical-0.8-wxicon.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: wxGTK2-devel BuildRequires: desktop-file-utils Requires: unzip %description Comical is a fully featured GUI comic book viewer using wxWidgets. It can view CBZ and CBR format files. %prep %setup -q %patch0 -p1 %patch1 -p1 %patch2 -p1 %build make %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_bindir} install -m0755 comical $RPM_BUILD_ROOT%{_bindir} install -p -D -m0644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}.png desktop-file-install --vendor livna \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category X-Livna \ %{SOURCE2} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc AUTHORS COPYING README TODO %{_bindir}/comical %{_datadir}/applications/*.desktop %{_datadir}/pixmaps/%{name}.png %changelog * Sat Sep 27 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.8-6 - Fix building with latest wxWidgets * Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.8-5 - rebuild * Fri Oct 06 2006 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 0.8-4 - rebuilt for unwind info generation, broken in gcc-4.1.1-21 * Tue Sep 26 2006 Andreas Thienemann <andreas(a)bawue.net> 0.8-3 - Bump for rebuild. * Mon Jul 31 2006 Andreas Thienemann <andreas(a)bawue.net> 0.8-2 - Import into livna due to libunrar licensing issues. - Bumped to 0.8-2 * Mon Apr 24 2006 Tom "spot" Callaway <tcallawa(a)redhat.com> 0.8-1 - bump for 0.8 * Tue Feb 28 2006 Tom "spot" Callaway <tcallawa(a)redhat.com> 0.7-2 - bump for FC5 * Thu Jan 5 2006 Tom "spot" Callaway <tcallawa(a)redhat.com> 0.7-1 - bump to 0.7 - disable all the sort patches, the 0.7 sort is no better than the original 0.4 sort, but they changed how they did it, so the old sort patches would have to be reworked... and I'm not motivated right now. * Sat Jun 4 2005 Tom "spot" Callaway <tcallawa(a)redhat.com> 0.4-9 - fix x86_64 by not using std::min * Fri Jun 3 2005 Tom "spot" Callaway <tcallawa(a)redhat.com> 0.4-8 - add dist tag * Sun Apr 10 2005 Tom "spot" Callaway <tcallawa(a)redhat.com> 0.4-7 - Support images that end in ".jpe". Most likely, .jpeg files that were truncated by saving/compressing. * Sat Apr 9 2005 Tom "spot" Callaway <tcallawa(a)redhat.com> 0.4-6 - Minor spec cleanups. * Sat Apr 9 2005 Tom "spot" Callaway <tcallawa(a)redhat.com> 0.4-5 - Enhance the sort algorithm to be more intelligent. * Mon Apr 4 2005 Tom "spot" Callaway <tcallawa(a)redhat.com> 0.4-4 - drop --with-gtk from configure, unused - backout "bracket" patch, it breaks if [ or ] are in the directory path * Mon Apr 4 2005 Tom "spot" Callaway <tcallawa(a)redhat.com> 0.4-3 - Add sort menu option to enable/disable sorting of images in archive - Add logo from Brian Pepple - Add desktop entry - Add patch to gracefully deal with the absence of unrar * Sun Apr 3 2005 Tom "spot" Callaway <tcallawa(a)redhat.com> 0.4-2 - patch for handling files with [ or ] in their names * Sun Apr 3 2005 Tom "spot" Callaway <tcallawa(a)redhat.com> 0.4-1 - inital package for Fedora Extras - CBR support only works with unrar, but we can't have that as a dep due to licensing issues with unrar. Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/comical/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 22 Jul 2008 16:48:22 -0000 1.1 +++ .cvsignore 27 Sep 2008 18:55:08 -0000 1.2 @@ -0,0 +1,2 @@ +comical-0.8.tar.gz +comical.png Index: sources =================================================================== RCS file: /cvs/free/rpms/comical/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 22 Jul 2008 16:48:22 -0000 1.1 +++ sources 27 Sep 2008 18:55:09 -0000 1.2 @@ -0,0 +1,2 @@ +f5808e28fd5a2a3d21b59cdad10eca3d comical-0.8.tar.gz +7e38455e43a0bee5994caa3bd6b901bb comical.png

16 years, 2 months

1
0
0 / 0

rpms/comical/F-8 comical-0.8-jpe.patch, NONE, 1.1 comical-0.8-optflags.patch, NONE, 1.1 comical-0.8-wxicon.patch, NONE, 1.1 comical.desktop, NONE, 1.1 comical.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

by jwrdegoede

Author: jwrdegoede Update of /cvs/free/rpms/comical/F-8 In directory se02.es.rpmfusion.net:/tmp/cvs-serv25260 Modified Files: .cvsignore sources Added Files: comical-0.8-jpe.patch comical-0.8-optflags.patch comical-0.8-wxicon.patch comical.desktop comical.spec Log Message: * Sat Sep 27 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.8-6 - Fix building with latest wxWidgets comical-0.8-jpe.patch: --- NEW FILE comical-0.8-jpe.patch --- --- comical-0.8/src/ComicBookZIP.cpp.BAD 2006-04-24 20:41:07.000000000 -0500 +++ comical-0.8/src/ComicBookZIP.cpp 2006-04-24 20:41:30.000000000 -0500 @@ -54,7 +54,7 @@ do { unzGetCurrentFileInfo(ZipFile, fileInfo, namebuf, 1024, NULL, 0, NULL, 0); page = wxString::FromAscii(namebuf); - if(page.Right(5).Upper() == wxT(".JPEG") || page.Right(4).Upper() == wxT(".JPG") || + if(page.Right(5).Upper() == wxT(".JPEG") || page.Right(4).Upper() == wxT(".JPG") || page.Right(4).Upper() == wxT(".JPE") || page.Right(4).Upper() == wxT(".GIF") || page.Right(4).Upper() == wxT(".PNG")) Filenames->Add(page); --- comical-0.8/src/ComicBookRAR.cpp.BAD 2006-04-24 20:41:56.000000000 -0500 +++ comical-0.8/src/ComicBookRAR.cpp 2006-04-24 20:42:15.000000000 -0500 @@ -67,7 +67,7 @@ #else page = wxString(header.FileName); #endif - if(page.Right(5).Upper() == wxT(".JPEG") || page.Right(4).Upper() == wxT(".JPG") || + if(page.Right(5).Upper() == wxT(".JPEG") || page.Right(4).Upper() == wxT(".JPG") || page.Right(4).Upper() == wxT(".JPE") || page.Right(4).Upper() == wxT(".GIF") || page.Right(4).Upper() == wxT(".PNG")) Filenames->Add(page); comical-0.8-optflags.patch: --- NEW FILE comical-0.8-optflags.patch --- --- comical-0.8/unrar/makefile.linux.BAD 2006-02-11 10:15:09.000000000 -0600 +++ comical-0.8/unrar/makefile.linux 2006-04-24 20:43:10.000000000 -0500 @@ -7,7 +7,7 @@ # Linux using GCC CXX=g++ -CXXFLAGS=-O2 -fPIC +CXXFLAGS=-O2 -fPIC $(RPM_OPT_FLAGS) DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE STRIP=strip AR=ar --- comical-0.8/src/Makefile.BAD 2006-04-24 20:44:53.000000000 -0500 +++ comical-0.8/src/Makefile 2006-04-24 20:45:04.000000000 -0500 @@ -1,5 +1,5 @@ INCLUDE = -I../unrar -I../unzip -CFLAGS = -O2 -Wall -pipe +CFLAGS = -O2 -Wall -pipe $(RPM_OPT_FLAGS) CPPFLAGS = `wx-config --cxxflags` $(CFLAGS) -D_UNIX $(INCLUDE) .SUFFIXES: .cpp .png .h .d .o comical-0.8-wxicon.patch: --- NEW FILE comical-0.8-wxicon.patch --- diff -up comical-0.8/src/ComicalApp.cpp~ comical-0.8/src/ComicalApp.cpp --- comical-0.8/src/ComicalApp.cpp~ 2008-09-27 20:48:34.000000000 +0200 +++ comical-0.8/src/ComicalApp.cpp 2008-09-27 20:48:34.000000000 +0200 @@ -25,6 +25,7 @@ * * ***************************************************************************/ +#include <wx/icon.h> #include "ComicalApp.h" #include "ComicalFrame.h" #include <wx/log.h> --- NEW FILE comical.desktop --- [Desktop Entry] Encoding=UTF-8 Name=Comical GenericName=Comic Archive Reader Comment=Open .cbr & .cbz files Exec=comical Icon=comical.png StartupNotify=false Terminal=false Type=Application Categories=Application;Graphics;X-Livna; Version=0.9.4 X-Desktop-File-Install-Version=0.4 --- NEW FILE comical.spec --- Name: comical Version: 0.8 Release: 6%{?dist} Summary: GUI comic book viewer License: GPLv2 Group: Applications/Multimedia URL: http://comical.sourceforge.net/ Source0: http://download.sourceforge.net/comical/comical-%{version}.tar.gz Source1: comical.png Source2: comical.desktop Patch0: comical-0.8-jpe.patch Patch1: comical-0.8-optflags.patch Patch2: comical-0.8-wxicon.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: wxGTK2-devel BuildRequires: desktop-file-utils Requires: unzip %description Comical is a fully featured GUI comic book viewer using wxWidgets. It can view CBZ and CBR format files. %prep %setup -q %patch0 -p1 %patch1 -p1 %patch2 -p1 %build make %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_bindir} install -m0755 comical $RPM_BUILD_ROOT%{_bindir} install -p -D -m0644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}.png desktop-file-install --vendor livna \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category X-Livna \ %{SOURCE2} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc AUTHORS COPYING README TODO %{_bindir}/comical %{_datadir}/applications/*.desktop %{_datadir}/pixmaps/%{name}.png %changelog * Sat Sep 27 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.8-6 - Fix building with latest wxWidgets * Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.8-5 - rebuild * Fri Oct 06 2006 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 0.8-4 - rebuilt for unwind info generation, broken in gcc-4.1.1-21 * Tue Sep 26 2006 Andreas Thienemann <andreas(a)bawue.net> 0.8-3 - Bump for rebuild. * Mon Jul 31 2006 Andreas Thienemann <andreas(a)bawue.net> 0.8-2 - Import into livna due to libunrar licensing issues. - Bumped to 0.8-2 * Mon Apr 24 2006 Tom "spot" Callaway <tcallawa(a)redhat.com> 0.8-1 - bump for 0.8 * Tue Feb 28 2006 Tom "spot" Callaway <tcallawa(a)redhat.com> 0.7-2 - bump for FC5 * Thu Jan 5 2006 Tom "spot" Callaway <tcallawa(a)redhat.com> 0.7-1 - bump to 0.7 - disable all the sort patches, the 0.7 sort is no better than the original 0.4 sort, but they changed how they did it, so the old sort patches would have to be reworked... and I'm not motivated right now. * Sat Jun 4 2005 Tom "spot" Callaway <tcallawa(a)redhat.com> 0.4-9 - fix x86_64 by not using std::min * Fri Jun 3 2005 Tom "spot" Callaway <tcallawa(a)redhat.com> 0.4-8 - add dist tag * Sun Apr 10 2005 Tom "spot" Callaway <tcallawa(a)redhat.com> 0.4-7 - Support images that end in ".jpe". Most likely, .jpeg files that were truncated by saving/compressing. * Sat Apr 9 2005 Tom "spot" Callaway <tcallawa(a)redhat.com> 0.4-6 - Minor spec cleanups. * Sat Apr 9 2005 Tom "spot" Callaway <tcallawa(a)redhat.com> 0.4-5 - Enhance the sort algorithm to be more intelligent. * Mon Apr 4 2005 Tom "spot" Callaway <tcallawa(a)redhat.com> 0.4-4 - drop --with-gtk from configure, unused - backout "bracket" patch, it breaks if [ or ] are in the directory path * Mon Apr 4 2005 Tom "spot" Callaway <tcallawa(a)redhat.com> 0.4-3 - Add sort menu option to enable/disable sorting of images in archive - Add logo from Brian Pepple - Add desktop entry - Add patch to gracefully deal with the absence of unrar * Sun Apr 3 2005 Tom "spot" Callaway <tcallawa(a)redhat.com> 0.4-2 - patch for handling files with [ or ] in their names * Sun Apr 3 2005 Tom "spot" Callaway <tcallawa(a)redhat.com> 0.4-1 - inital package for Fedora Extras - CBR support only works with unrar, but we can't have that as a dep due to licensing issues with unrar. Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/comical/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 22 Jul 2008 16:48:22 -0000 1.1 +++ .cvsignore 27 Sep 2008 18:55:04 -0000 1.2 @@ -0,0 +1,2 @@ +comical-0.8.tar.gz +comical.png Index: sources =================================================================== RCS file: /cvs/free/rpms/comical/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 22 Jul 2008 16:48:22 -0000 1.1 +++ sources 27 Sep 2008 18:55:04 -0000 1.2 @@ -0,0 +1,2 @@ +f5808e28fd5a2a3d21b59cdad10eca3d comical-0.8.tar.gz +7e38455e43a0bee5994caa3bd6b901bb comical.png

16 years, 2 months

1
0
0 / 0

rpms/comical/devel comical-0.8-wxicon.patch, NONE, 1.1 comical.spec, 1.1, 1.2

by jwrdegoede

Author: jwrdegoede Update of /cvs/free/rpms/comical/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv24862 Modified Files: comical.spec Added Files: comical-0.8-wxicon.patch Log Message: * Sat Sep 27 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.8-6 - Fix building with latest wxWidgets comical-0.8-wxicon.patch: --- NEW FILE comical-0.8-wxicon.patch --- diff -up comical-0.8/src/ComicalApp.cpp~ comical-0.8/src/ComicalApp.cpp --- comical-0.8/src/ComicalApp.cpp~ 2008-09-27 20:48:34.000000000 +0200 +++ comical-0.8/src/ComicalApp.cpp 2008-09-27 20:48:34.000000000 +0200 @@ -25,6 +25,7 @@ * * ***************************************************************************/ +#include <wx/icon.h> #include "ComicalApp.h" #include "ComicalFrame.h" #include <wx/log.h> Index: comical.spec =================================================================== RCS file: /cvs/free/rpms/comical/devel/comical.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- comical.spec 3 Aug 2008 14:11:38 -0000 1.1 +++ comical.spec 27 Sep 2008 18:53:15 -0000 1.2 @@ -1,6 +1,6 @@ Name: comical Version: 0.8 -Release: 5%{?dist} +Release: 6%{?dist} Summary: GUI comic book viewer License: GPLv2 Group: Applications/Multimedia @@ -10,6 +10,7 @@ Source2: comical.desktop Patch0: comical-0.8-jpe.patch Patch1: comical-0.8-optflags.patch +Patch2: comical-0.8-wxicon.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: wxGTK2-devel BuildRequires: desktop-file-utils @@ -23,6 +24,7 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build make @@ -49,6 +51,9 @@ %{_datadir}/pixmaps/%{name}.png %changelog +* Sat Sep 27 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.8-6 +- Fix building with latest wxWidgets + * Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.8-5 - rebuild

16 years, 2 months

1
0
0 / 0

rpms/avidemux/F-8 avidemux-2.4-i18n.patch, NONE, 1.1 avidemux-2.4-libdca.patch, NONE, 1.1 avidemux-2.4.2-pulseaudio-default.patch, NONE, 1.1 avidemux-2.4.3-ppc.patch, NONE, 1.1 avidemux-2.4.3-qt4.patch, NONE, 1.1 avidemux.spec, NONE, 1.1 sources, 1.1, 1.2

by Stewart Adam

Author: firewing Update of /cvs/free/rpms/avidemux/F-8 In directory se02.es.rpmfusion.net:/tmp/cvs-serv19408/F-8 Modified Files: sources Added Files: avidemux-2.4-i18n.patch avidemux-2.4-libdca.patch avidemux-2.4.2-pulseaudio-default.patch avidemux-2.4.3-ppc.patch avidemux-2.4.3-qt4.patch avidemux.spec Log Message: Populate F-8 and F-9 avidemux-2.4-i18n.patch: --- NEW FILE avidemux-2.4-i18n.patch --- diff -ur avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp --- avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp 2007-10-16 21:23:21.000000000 +0300 +++ avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp 2007-12-28 20:35:30.000000000 +0200 @@ -53,7 +53,7 @@ { printf("\n[Locale] Locale: %s\n", QLocale::system().name().toUtf8().constData()); - QString appdir = QCoreApplication::applicationDirPath() + "/i18n/"; + QString appdir = "/usr/share/avidemux/i18n/"; loadTranslation(&qtTranslator, appdir + "qt_" + QLocale::system().name()); loadTranslation(&avidemuxTranslator, appdir + "avidemux_" + QLocale::system().name()); diff -ur cmake/Ts.cmake cmake/Ts.cmake --- cmake/Ts.cmake 2007-10-14 14:58:28.000000000 +0300 +++ cmake/Ts.cmake 2007-12-28 20:36:05.000000000 +0200 @@ -63,7 +63,7 @@ SET(qm_files ${qm_files} ${_outXml} ${_out}) - INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/bin/i18n") + INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/avidemux/i18n") ENDFOREACH(ts_input ${ts_files}) SET(${_sources} ${${_sources}} ${qm_files}) @@ -94,7 +94,7 @@ SET(qm_files ${qm_files} ${_out}) - INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/bin/i18n") + INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/avidemux/i18n") ENDFOREACH(ts_input ${ts_files}) SET(${_sources} ${${_sources}} ${qm_files}) avidemux-2.4-libdca.patch: --- NEW FILE avidemux-2.4-libdca.patch --- diff -p -up avidemux/CMakeLists.txt.libdca avidemux/CMakeLists.txt --- avidemux/CMakeLists.txt.libdca 2008-06-28 15:03:51.000000000 +0200 +++ avidemux/CMakeLists.txt 2008-07-24 15:43:18.000000000 +0200 @@ -331,7 +331,7 @@ endif(USE_AMR_NB AND NOT USE_LATE_BINDIN #libdts if(USE_LIBDCA AND NOT USE_LATE_BINDING) - add_libs_all_targets(dts) + add_libs_all_targets(dca) endif(USE_LIBDCA AND NOT USE_LATE_BINDING) # Lame diff -p -up ConfigureChecks.cmake.libdca ConfigureChecks.cmake --- ConfigureChecks.cmake.libdca 2008-07-05 20:24:01.000000000 +0200 +++ ConfigureChecks.cmake 2008-07-24 15:43:18.000000000 +0200 @@ -475,7 +475,7 @@ SET(CMAKE_REQUIRED_LIBRARIES "-lm") IF (USE_LATE_BINDING) CHECK_INCLUDE_FILES(dts.h USE_LIBDCA) ELSE (USE_LATE_BINDING) - ADM_CHECK_HL(libdca dts.h dts dts_init USE_LIBDCA) + ADM_CHECK_HL(libdca dts.h dca dca_init USE_LIBDCA) ENDIF (USE_LATE_BINDING) SET(CMAKE_REQUIRED_LIBRARIES) diff -p -up configure.in.in.libdca configure.in.in --- configure.in.in.libdca 2008-07-24 15:43:18.000000000 +0200 +++ configure.in.in 2008-07-24 15:51:57.000000000 +0200 @@ -891,18 +891,14 @@ have_libdca=no if test "x$with_libdca" != "xno"; then have_libdca=yes AC_CHECK_HEADERS([dts.h], , have_libdca=no) - - if test "x$have_libdca" = "xyes"; then - AC_CHECK_HEADERS([dts_internal.h], , have_libdca=no) - + if test "x$have_libdca" = "xyes"; then if test "x$use_late_binding" = "xno"; then - AC_CHECK_LIB(dts, dts_init, , have_libdca=no) + AC_CHECK_LIB(dca, dca_init, , have_libdca=no) fi else AC_MSG_WARN(dts.h is there but I also need dts_internal.h to compile libdca/libdts. Please copy dts_internal.h where dts.h is) fi - fi if test "x$have_libdca" = "xyes"; then AC_DEFINE(USE_LIBDCA, 1, "[libdca detected]") avidemux-2.4.2-pulseaudio-default.patch: --- NEW FILE avidemux-2.4.2-pulseaudio-default.patch --- --- avidemux/prefs.in.old 2008-06-22 15:24:53.000000000 -0400 +++ avidemux/prefs.in 2008-07-19 21:08:03.000000000 -0400 @@ -55,7 +55,7 @@ #else device.audiodevice, STRING, ALSA #endif -device.audio.alsa_device, STRING, "dmix" +device.audio.alsa_device, STRING, "pulse" device.videodevice, UINT, 0, 0, 10 # Posproc default.postproc_type, UINT, 3, 0, 7 avidemux-2.4.3-ppc.patch: --- NEW FILE avidemux-2.4.3-ppc.patch --- --- ConfigureChecks.cmake (revision 4376) +++ ConfigureChecks.cmake (working copy) @@ -32,6 +32,9 @@ SET(ADM_CPU_X86_64 1) ELSEIF (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ppc") SET(ADM_CPU_PPC 1) + ELSEIF (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ppc64") + SET(ADM_CPU_PPC 1) + SET(ARCH_64_BITS 1) ENDIF (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "i386" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "i586" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "i686") ENDIF (WIN32) avidemux-2.4.3-qt4.patch: --- NEW FILE avidemux-2.4.3-qt4.patch --- --- cmake/Ts.cmake.orig 2008-09-26 20:37:17.000000000 -0400 +++ cmake/Ts.cmake 2008-09-26 20:37:20.000000000 -0400 @@ -14,7 +14,7 @@ MACRO(FIND_LRELEASE) IF(NOT LRELEASE_EXECUTABLE AND NOT LRELEASE_NOT_FOUND) - FIND_PROGRAM(LRELEASE_EXECUTABLE lrelease PATHS + FIND_PROGRAM(LRELEASE_EXECUTABLE lrelease-qt4 PATHS "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin" "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin" $ENV{QTDIR}/bin) --- NEW FILE avidemux.spec --- #define svndate 20080521 Name: avidemux Version: 2.4.3 Release: 5%{?dist} Summary: Graphical video editing and transcoding tool Group: Applications/Multimedia License: GPLv2+ URL: http://www.avidemux.org/ Source0: http://download.berlios.de/avidemux/avidemux_%{version}.tar.gz Source1: %{name}-gtk.desktop Source2: %{name}-qt.desktop Patch0: avidemux-2.4.2-pulseaudio-default.patch Patch1: avidemux-2.4.3-qt4.patch Patch2: avidemux-2.4-i18n.patch # http://ftp.ncnu.edu.tw/Linux/Gentoo/gentoo-portage/media-video/avidemux/f... Patch3: avidemux-2.4-libdca.patch # http://avidemux.org/admForum/viewtopic.php?pid=29582#p29582 # http://avidemux.org/admForum/viewtopic.php?id=3991 Patch4: avidemux-2.4.3-ppc.patch #http://bugs.gentoo.org/attachment.cgi?id=160132&action=view BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: %{name}-cli = %{version} Requires: %{name}-gui = %{version} # Compiling BuildRequires: cmake BuildRequires: gettext-devel # Libraries BuildRequires: nasm >= 0.98.38 BuildRequires: libxml2-devel >= 2.6.8 BuildRequires: fontconfig-devel BuildRequires: freetype-devel BuildRequires: js-devel BuildRequires: libXv-devel BuildRequires: libXmu-devel # Required by gtk: libXi-devel, libXext-devel, libX11-devel # Required by qt: libXt-devel, libXext-devel, libX11-devel BuildRequires: libsamplerate-devel BuildRequires: jack-audio-connection-kit-devel # Sound out BuildRequires: alsa-lib-devel >= 1.0.3 BuildRequires: esound-devel >= 0.2.0 # Video out BuildRequires: SDL-devel >= 1.2.7 # Audio Codecs BuildRequires: a52dec-devel >= 0.7.4 BuildRequires: faac-devel >= 1.24 BuildRequires: faad2-devel >= 2.0 BuildRequires: lame-devel >= 3.96.1 BuildRequires: libmad-devel >= 0.15.1 BuildRequires: libogg-devel >= 1.1 BuildRequires: libvorbis-devel >= 1.0.1 # needs libdts/dts_internal.h; but that's not shipped by libdca-devel because # it's an internal lib. Someone needs to report that upstream to get fixed # ** this is fixed by patch3 BuildRequires: libdca-devel # Video Codecs BuildRequires: xvidcore-devel >= 1.0.2 BuildRequires: x264-devel BuildRequires: ffmpeg-devel # FIXME: aften not packaged, add BR when it is # Finally... BuildRequires: desktop-file-utils %description Avidemux is a free video editor designed for simple cutting, filtering and encoding tasks. It supports many file types, including AVI, DVD compatible MPEG files, MP4 and ASF, using a variety of codecs. Tasks can be automated using projects, job queue and powerful scripting capabilities. %package cli Summary: CLI for %{name} Group: Applications/Multimedia Provides: %{name}-cli = %{version}-%{release} %description cli This package provides command-line interface for %{name} %package gtk Summary: GTK GUI for %{name} Group: Applications/Multimedia BuildRequires: gtk2-devel >= 2.8.0 BuildRequires: cairo-devel # Slightly higher so it is default, but it can be avoided by installing # avidemux-qt directly or it can be removed later once avidemux-qt is installed Provides: %{name}-gui = %{version}-%{release}.1 %description gtk This package provides the GTK interface for %{name} %package qt Summary: QT GUI for %{name} Group: Applications/Multimedia BuildRequires: qt4-devel Provides: %{name}-gui = %{version}-%{release} %description qt This package provides the QT interface for %{name} %prep %setup -q -n avidemux_%{version} %patch0 -b .pulse %patch1 -b .qt4 %patch2 -b .i18n %patch3 -b .libdca %patch4 -b .ppc %build %cmake make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT desktop-file-install --vendor livna \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ %{SOURCE1} desktop-file-install --vendor livna \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ %{SOURCE2} find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog History README TODO %{_datadir}/%{name}/ %files cli %defattr(-,root,root,-) %{_bindir}/avidemux2_cli %files gtk %defattr(-,root,root,-) %{_bindir}/avidemux2_gtk %{_datadir}/applications/*gtk*.desktop %files qt %defattr(-,root,root,-) %{_bindir}/avidemux2_qt4 %{_datadir}/applications/*qt*.desktop %changelog * Thu Sep 18 2008 Stewart Adam <s.adam at diffingo.com> - 2.4.3-5 - Add CMake patch for PPC64 - Update patches for 2.4.3 - Remove outdated libmad patch (Nov. 2007) * Thu Sep 18 2008 Stewart Adam <s.adam at diffingo.com> - 2.4.3-4 - Add another patch to fix ppc64 build (pointer type), first patch was for libmad * Fri Aug 22 2008 Stewart Adam <s.adam at diffingo.com> - 2.4.3-3 - Add patch to fix ppc64 build * Sat Aug 16 2008 Stewart Adam <s.adam at diffingo.com> - 2.4.3-2 - retag * Sat Aug 16 2008 Stewart Adam <s.adam at diffingo.com> - 2.4.3-1 - Update to 2.4.3 * Tue Aug 12 2008 Stewart Adam <s.adam at diffingo.com> - 2.4.2-3 - ppc64 uint_32 fun * Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 2.4.2-2 - rebuild * Sat Jul 19 2008 Thorsten Leemhuis <s.adam at diffingo.com> - 2.4.2-1 - Update to 2.4.2 * Wed May 21 2008 Stewart Adam <s.adam AT diffingo DOT com> - 2.4.1-3.20080521svn - Disable --new-faad - 20080521 subversion snapshot * Sat Mar 15 2008 Stewart Adam <s.adam AT diffingo DOT com> - 2.4.1-2 - Disable %%{?_smp_mflags} * Sat Mar 15 2008 Stewart Adam <s.adam AT diffingo DOT com> - 2.4.1-1 - Update to 2.4.1 - Don't list the bin files twice, revisited - Default to GTK frontend * Wed Feb 20 2008 Stewart Adam <s.adam AT diffingo DOT com> - 2.4-6.20080126svn - Make pulseaudio default for sound out - Don't list the bin files twice - Don't build with arts support * Fri Feb 15 2008 Stewart Adam <s.adam AT diffingo DOT com> - 2.4-5.20080126svn - Don't list the .desktop files twice (bz#1870) - Oops, we should have %%{svndate}svn in release tag! * Sat Feb 2 2008 Stewart Adam <s.adam AT diffingo DOT com> - 2.4-4 - F-8/F-7 x86_64 does seem to need --with-newfaad * Fri Feb 1 2008 Stewart Adam <s.adam AT diffingo DOT com> - 2.4-3 - Update to version 2.4 (20080126svn) and include fixes from devel branch * Mon Jan 14 2008 Stewart Adam <s.adam AT diffingo DOT com> - 2.4-2 - Fix many copy/paste errors and desktop file's Exec field * Sun Jan 13 2008 Stewart Adam <s.adam AT diffingo DOT com> - 2.4-1 - Update to 2.4 final - Split up desktop files and make them pass desktop-file-validate - Add structure to split into gtk and qt pacakges - Disable qt4 for now, doesn't compile * Sun Oct 7 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info>3- 2.3.0-4.3 - move js-include to a place where it is honored * Sun Oct 7 2007 Stewart Adam <s.adam AT diffingo DOT com> - 2.3.0-4.2 - Fix macro problem - Fix changelog date - Rebuild with faad, but don't pass --newfaad * Sun Oct 7 2007 Stewart Adam <s.adam AT diffingo DOT com> - 2.3.0-4.1 - Rebuild with no faad * Sat Oct 6 2007 Stewart Adam <s.adam AT diffingo DOT com> - 2.3.0-4 - Rebuild for ffmpeg dependency problems - Update License: tag per Fedora guidelines * Sat Jan 13 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.3.0-3 - more features with new BR's: x264-devel libXv-devel - make a note regarding the libdca-devel problem - remove the "0:" from the versioned BR's * Thu Jan 04 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.3.0-2 - don't use smp_mflags during make for now * Sat Dec 23 2006 kwizart < kwizart at gmail.com > - 2.3.0-1 - Update to 2.3.0 Final - Use find_lang * Mon Apr 03 2006 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.1.2-1 - Update to 2.1.2 * Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - switch to new release field * Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - add dist * Wed Jan 04 2006 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:2.1.0-0.lvn.1 - Update to 2.1.0 - Drop epoch - gtk 2.6 now, so drop FC3 support * Sat Aug 27 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:2.0.42-0.lvn.3 - Remove bogus BR ffmpeg-devel (#555) * Thu Jul 09 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:2.0.42-0.lvn.2 - Add missing BR desktop-file-utils (thanks to ixs) * Thu Jul 07 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:2.0.42-0.lvn.1 - Update to 2.0.42 * Sat Jan 22 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:2.0.36-0.lvn.1 - Update to 2.0.34 - Rename package to avidemux -- no need for avidemux2 afaics * Sun Nov 21 2004 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:2.0.34-0.lvn.1.test1 - Update to 2.0.34-test1 - BR gettext, libtool * Tue Oct 18 2004 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:2.0.30-0.lvn.1 - Initial RPM release. Index: sources =================================================================== RCS file: /cvs/free/rpms/avidemux/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 22 Jul 2008 16:48:14 -0000 1.1 +++ sources 27 Sep 2008 17:11:23 -0000 1.2 @@ -0,0 +1 @@ +ff8e6ac186321e7e8bec9f8177df3724 avidemux_2.4.3.tar.gz

16 years, 2 months

1
0
0 / 0

rpms/avidemux/F-9 avidemux-2.4-i18n.patch, NONE, 1.1 avidemux-2.4-libdca.patch, NONE, 1.1 avidemux-2.4.2-pulseaudio-default.patch, NONE, 1.1 avidemux-2.4.3-ppc.patch, NONE, 1.1 avidemux-2.4.3-qt4.patch, NONE, 1.1 avidemux.spec, NONE, 1.1 sources, 1.1, 1.2

by Stewart Adam

Author: firewing Update of /cvs/free/rpms/avidemux/F-9 In directory se02.es.rpmfusion.net:/tmp/cvs-serv19408/F-9 Modified Files: sources Added Files: avidemux-2.4-i18n.patch avidemux-2.4-libdca.patch avidemux-2.4.2-pulseaudio-default.patch avidemux-2.4.3-ppc.patch avidemux-2.4.3-qt4.patch avidemux.spec Log Message: Populate F-8 and F-9 avidemux-2.4-i18n.patch: --- NEW FILE avidemux-2.4-i18n.patch --- diff -ur avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp --- avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp 2007-10-16 21:23:21.000000000 +0300 +++ avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp 2007-12-28 20:35:30.000000000 +0200 @@ -53,7 +53,7 @@ { printf("\n[Locale] Locale: %s\n", QLocale::system().name().toUtf8().constData()); - QString appdir = QCoreApplication::applicationDirPath() + "/i18n/"; + QString appdir = "/usr/share/avidemux/i18n/"; loadTranslation(&qtTranslator, appdir + "qt_" + QLocale::system().name()); loadTranslation(&avidemuxTranslator, appdir + "avidemux_" + QLocale::system().name()); diff -ur cmake/Ts.cmake cmake/Ts.cmake --- cmake/Ts.cmake 2007-10-14 14:58:28.000000000 +0300 +++ cmake/Ts.cmake 2007-12-28 20:36:05.000000000 +0200 @@ -63,7 +63,7 @@ SET(qm_files ${qm_files} ${_outXml} ${_out}) - INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/bin/i18n") + INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/avidemux/i18n") ENDFOREACH(ts_input ${ts_files}) SET(${_sources} ${${_sources}} ${qm_files}) @@ -94,7 +94,7 @@ SET(qm_files ${qm_files} ${_out}) - INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/bin/i18n") + INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/avidemux/i18n") ENDFOREACH(ts_input ${ts_files}) SET(${_sources} ${${_sources}} ${qm_files}) avidemux-2.4-libdca.patch: --- NEW FILE avidemux-2.4-libdca.patch --- diff -p -up avidemux/CMakeLists.txt.libdca avidemux/CMakeLists.txt --- avidemux/CMakeLists.txt.libdca 2008-06-28 15:03:51.000000000 +0200 +++ avidemux/CMakeLists.txt 2008-07-24 15:43:18.000000000 +0200 @@ -331,7 +331,7 @@ endif(USE_AMR_NB AND NOT USE_LATE_BINDIN #libdts if(USE_LIBDCA AND NOT USE_LATE_BINDING) - add_libs_all_targets(dts) + add_libs_all_targets(dca) endif(USE_LIBDCA AND NOT USE_LATE_BINDING) # Lame diff -p -up ConfigureChecks.cmake.libdca ConfigureChecks.cmake --- ConfigureChecks.cmake.libdca 2008-07-05 20:24:01.000000000 +0200 +++ ConfigureChecks.cmake 2008-07-24 15:43:18.000000000 +0200 @@ -475,7 +475,7 @@ SET(CMAKE_REQUIRED_LIBRARIES "-lm") IF (USE_LATE_BINDING) CHECK_INCLUDE_FILES(dts.h USE_LIBDCA) ELSE (USE_LATE_BINDING) - ADM_CHECK_HL(libdca dts.h dts dts_init USE_LIBDCA) + ADM_CHECK_HL(libdca dts.h dca dca_init USE_LIBDCA) ENDIF (USE_LATE_BINDING) SET(CMAKE_REQUIRED_LIBRARIES) diff -p -up configure.in.in.libdca configure.in.in --- configure.in.in.libdca 2008-07-24 15:43:18.000000000 +0200 +++ configure.in.in 2008-07-24 15:51:57.000000000 +0200 @@ -891,18 +891,14 @@ have_libdca=no if test "x$with_libdca" != "xno"; then have_libdca=yes AC_CHECK_HEADERS([dts.h], , have_libdca=no) - - if test "x$have_libdca" = "xyes"; then - AC_CHECK_HEADERS([dts_internal.h], , have_libdca=no) - + if test "x$have_libdca" = "xyes"; then if test "x$use_late_binding" = "xno"; then - AC_CHECK_LIB(dts, dts_init, , have_libdca=no) + AC_CHECK_LIB(dca, dca_init, , have_libdca=no) fi else AC_MSG_WARN(dts.h is there but I also need dts_internal.h to compile libdca/libdts. Please copy dts_internal.h where dts.h is) fi - fi if test "x$have_libdca" = "xyes"; then AC_DEFINE(USE_LIBDCA, 1, "[libdca detected]") avidemux-2.4.2-pulseaudio-default.patch: --- NEW FILE avidemux-2.4.2-pulseaudio-default.patch --- --- avidemux/prefs.in.old 2008-06-22 15:24:53.000000000 -0400 +++ avidemux/prefs.in 2008-07-19 21:08:03.000000000 -0400 @@ -55,7 +55,7 @@ #else device.audiodevice, STRING, ALSA #endif -device.audio.alsa_device, STRING, "dmix" +device.audio.alsa_device, STRING, "pulse" device.videodevice, UINT, 0, 0, 10 # Posproc default.postproc_type, UINT, 3, 0, 7 avidemux-2.4.3-ppc.patch: --- NEW FILE avidemux-2.4.3-ppc.patch --- --- ConfigureChecks.cmake (revision 4376) +++ ConfigureChecks.cmake (working copy) @@ -32,6 +32,9 @@ SET(ADM_CPU_X86_64 1) ELSEIF (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ppc") SET(ADM_CPU_PPC 1) + ELSEIF (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ppc64") + SET(ADM_CPU_PPC 1) + SET(ARCH_64_BITS 1) ENDIF (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "i386" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "i586" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "i686") ENDIF (WIN32) avidemux-2.4.3-qt4.patch: --- NEW FILE avidemux-2.4.3-qt4.patch --- --- cmake/Ts.cmake.orig 2008-09-26 20:37:17.000000000 -0400 +++ cmake/Ts.cmake 2008-09-26 20:37:20.000000000 -0400 @@ -14,7 +14,7 @@ MACRO(FIND_LRELEASE) IF(NOT LRELEASE_EXECUTABLE AND NOT LRELEASE_NOT_FOUND) - FIND_PROGRAM(LRELEASE_EXECUTABLE lrelease PATHS + FIND_PROGRAM(LRELEASE_EXECUTABLE lrelease-qt4 PATHS "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin" "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin" $ENV{QTDIR}/bin) --- NEW FILE avidemux.spec --- #define svndate 20080521 Name: avidemux Version: 2.4.3 Release: 5%{?dist} Summary: Graphical video editing and transcoding tool Group: Applications/Multimedia License: GPLv2+ URL: http://www.avidemux.org/ Source0: http://download.berlios.de/avidemux/avidemux_%{version}.tar.gz Source1: %{name}-gtk.desktop Source2: %{name}-qt.desktop Patch0: avidemux-2.4.2-pulseaudio-default.patch Patch1: avidemux-2.4.3-qt4.patch Patch2: avidemux-2.4-i18n.patch # http://ftp.ncnu.edu.tw/Linux/Gentoo/gentoo-portage/media-video/avidemux/f... Patch3: avidemux-2.4-libdca.patch # http://avidemux.org/admForum/viewtopic.php?pid=29582#p29582 # http://avidemux.org/admForum/viewtopic.php?id=3991 Patch4: avidemux-2.4.3-ppc.patch #http://bugs.gentoo.org/attachment.cgi?id=160132&action=view BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: %{name}-cli = %{version} Requires: %{name}-gui = %{version} # Compiling BuildRequires: cmake BuildRequires: gettext-devel # Libraries BuildRequires: nasm >= 0.98.38 BuildRequires: libxml2-devel >= 2.6.8 BuildRequires: fontconfig-devel BuildRequires: freetype-devel BuildRequires: js-devel BuildRequires: libXv-devel BuildRequires: libXmu-devel # Required by gtk: libXi-devel, libXext-devel, libX11-devel # Required by qt: libXt-devel, libXext-devel, libX11-devel BuildRequires: libsamplerate-devel BuildRequires: jack-audio-connection-kit-devel # Sound out BuildRequires: alsa-lib-devel >= 1.0.3 BuildRequires: esound-devel >= 0.2.0 # Video out BuildRequires: SDL-devel >= 1.2.7 # Audio Codecs BuildRequires: a52dec-devel >= 0.7.4 BuildRequires: faac-devel >= 1.24 BuildRequires: faad2-devel >= 2.0 BuildRequires: lame-devel >= 3.96.1 BuildRequires: libmad-devel >= 0.15.1 BuildRequires: libogg-devel >= 1.1 BuildRequires: libvorbis-devel >= 1.0.1 # needs libdts/dts_internal.h; but that's not shipped by libdca-devel because # it's an internal lib. Someone needs to report that upstream to get fixed # ** this is fixed by patch3 BuildRequires: libdca-devel # Video Codecs BuildRequires: xvidcore-devel >= 1.0.2 BuildRequires: x264-devel BuildRequires: ffmpeg-devel # FIXME: aften not packaged, add BR when it is # Finally... BuildRequires: desktop-file-utils %description Avidemux is a free video editor designed for simple cutting, filtering and encoding tasks. It supports many file types, including AVI, DVD compatible MPEG files, MP4 and ASF, using a variety of codecs. Tasks can be automated using projects, job queue and powerful scripting capabilities. %package cli Summary: CLI for %{name} Group: Applications/Multimedia Provides: %{name}-cli = %{version}-%{release} %description cli This package provides command-line interface for %{name} %package gtk Summary: GTK GUI for %{name} Group: Applications/Multimedia BuildRequires: gtk2-devel >= 2.8.0 BuildRequires: cairo-devel # Slightly higher so it is default, but it can be avoided by installing # avidemux-qt directly or it can be removed later once avidemux-qt is installed Provides: %{name}-gui = %{version}-%{release}.1 %description gtk This package provides the GTK interface for %{name} %package qt Summary: QT GUI for %{name} Group: Applications/Multimedia BuildRequires: qt4-devel Provides: %{name}-gui = %{version}-%{release} %description qt This package provides the QT interface for %{name} %prep %setup -q -n avidemux_%{version} %patch0 -b .pulse %patch1 -b .qt4 %patch2 -b .i18n %patch3 -b .libdca %patch4 -b .ppc %build %cmake make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT desktop-file-install --vendor livna \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ %{SOURCE1} desktop-file-install --vendor livna \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ %{SOURCE2} find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog History README TODO %{_datadir}/%{name}/ %files cli %defattr(-,root,root,-) %{_bindir}/avidemux2_cli %files gtk %defattr(-,root,root,-) %{_bindir}/avidemux2_gtk %{_datadir}/applications/*gtk*.desktop %files qt %defattr(-,root,root,-) %{_bindir}/avidemux2_qt4 %{_datadir}/applications/*qt*.desktop %changelog * Thu Sep 18 2008 Stewart Adam <s.adam at diffingo.com> - 2.4.3-5 - Add CMake patch for PPC64 - Update patches for 2.4.3 - Remove outdated libmad patch (Nov. 2007) * Thu Sep 18 2008 Stewart Adam <s.adam at diffingo.com> - 2.4.3-4 - Add another patch to fix ppc64 build (pointer type), first patch was for libmad * Fri Aug 22 2008 Stewart Adam <s.adam at diffingo.com> - 2.4.3-3 - Add patch to fix ppc64 build * Sat Aug 16 2008 Stewart Adam <s.adam at diffingo.com> - 2.4.3-2 - retag * Sat Aug 16 2008 Stewart Adam <s.adam at diffingo.com> - 2.4.3-1 - Update to 2.4.3 * Tue Aug 12 2008 Stewart Adam <s.adam at diffingo.com> - 2.4.2-3 - ppc64 uint_32 fun * Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 2.4.2-2 - rebuild * Sat Jul 19 2008 Thorsten Leemhuis <s.adam at diffingo.com> - 2.4.2-1 - Update to 2.4.2 * Wed May 21 2008 Stewart Adam <s.adam AT diffingo DOT com> - 2.4.1-3.20080521svn - Disable --new-faad - 20080521 subversion snapshot * Sat Mar 15 2008 Stewart Adam <s.adam AT diffingo DOT com> - 2.4.1-2 - Disable %%{?_smp_mflags} * Sat Mar 15 2008 Stewart Adam <s.adam AT diffingo DOT com> - 2.4.1-1 - Update to 2.4.1 - Don't list the bin files twice, revisited - Default to GTK frontend * Wed Feb 20 2008 Stewart Adam <s.adam AT diffingo DOT com> - 2.4-6.20080126svn - Make pulseaudio default for sound out - Don't list the bin files twice - Don't build with arts support * Fri Feb 15 2008 Stewart Adam <s.adam AT diffingo DOT com> - 2.4-5.20080126svn - Don't list the .desktop files twice (bz#1870) - Oops, we should have %%{svndate}svn in release tag! * Sat Feb 2 2008 Stewart Adam <s.adam AT diffingo DOT com> - 2.4-4 - F-8/F-7 x86_64 does seem to need --with-newfaad * Fri Feb 1 2008 Stewart Adam <s.adam AT diffingo DOT com> - 2.4-3 - Update to version 2.4 (20080126svn) and include fixes from devel branch * Mon Jan 14 2008 Stewart Adam <s.adam AT diffingo DOT com> - 2.4-2 - Fix many copy/paste errors and desktop file's Exec field * Sun Jan 13 2008 Stewart Adam <s.adam AT diffingo DOT com> - 2.4-1 - Update to 2.4 final - Split up desktop files and make them pass desktop-file-validate - Add structure to split into gtk and qt pacakges - Disable qt4 for now, doesn't compile * Sun Oct 7 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info>3- 2.3.0-4.3 - move js-include to a place where it is honored * Sun Oct 7 2007 Stewart Adam <s.adam AT diffingo DOT com> - 2.3.0-4.2 - Fix macro problem - Fix changelog date - Rebuild with faad, but don't pass --newfaad * Sun Oct 7 2007 Stewart Adam <s.adam AT diffingo DOT com> - 2.3.0-4.1 - Rebuild with no faad * Sat Oct 6 2007 Stewart Adam <s.adam AT diffingo DOT com> - 2.3.0-4 - Rebuild for ffmpeg dependency problems - Update License: tag per Fedora guidelines * Sat Jan 13 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.3.0-3 - more features with new BR's: x264-devel libXv-devel - make a note regarding the libdca-devel problem - remove the "0:" from the versioned BR's * Thu Jan 04 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.3.0-2 - don't use smp_mflags during make for now * Sat Dec 23 2006 kwizart < kwizart at gmail.com > - 2.3.0-1 - Update to 2.3.0 Final - Use find_lang * Mon Apr 03 2006 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.1.2-1 - Update to 2.1.2 * Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - switch to new release field * Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - add dist * Wed Jan 04 2006 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:2.1.0-0.lvn.1 - Update to 2.1.0 - Drop epoch - gtk 2.6 now, so drop FC3 support * Sat Aug 27 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:2.0.42-0.lvn.3 - Remove bogus BR ffmpeg-devel (#555) * Thu Jul 09 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:2.0.42-0.lvn.2 - Add missing BR desktop-file-utils (thanks to ixs) * Thu Jul 07 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:2.0.42-0.lvn.1 - Update to 2.0.42 * Sat Jan 22 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:2.0.36-0.lvn.1 - Update to 2.0.34 - Rename package to avidemux -- no need for avidemux2 afaics * Sun Nov 21 2004 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:2.0.34-0.lvn.1.test1 - Update to 2.0.34-test1 - BR gettext, libtool * Tue Oct 18 2004 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:2.0.30-0.lvn.1 - Initial RPM release. Index: sources =================================================================== RCS file: /cvs/free/rpms/avidemux/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 22 Jul 2008 16:48:14 -0000 1.1 +++ sources 27 Sep 2008 17:11:23 -0000 1.2 @@ -0,0 +1 @@ +ff8e6ac186321e7e8bec9f8177df3724 avidemux_2.4.3.tar.gz

16 years, 2 months

1
0
0 / 0

rpms/avidemux/devel avidemux-2.4.3-ppc.patch, NONE, 1.1 avidemux-2.4.3-qt4.patch, NONE, 1.1 avidemux-2.4-i18n.patch, 1.1, 1.2 avidemux-2.4-libdca.patch, 1.1, 1.2 avidemux-2.4.2-pulseaudio-default.patch, 1.1, 1.2 avidemux-gtk.desktop, 1.1, 1.2 avidemux-qt.desktop, 1.1, 1.2 avidemux.spec, 1.6, 1.7 avidemux-2.4-ppc-libmad.patch, 1.1, NONE avidemux-2.4.1-qt4.patch, 1.1, NONE avidemux-2.4.3-lrelease.patch, 1.1, NONE avidemux-2.4.3-ppc-ptr.patch, 1.1, NONE

by Stewart Adam

Author: firewing Update of /cvs/free/rpms/avidemux/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv23575 Modified Files: avidemux-2.4-i18n.patch avidemux-2.4-libdca.patch avidemux-2.4.2-pulseaudio-default.patch avidemux-gtk.desktop avidemux-qt.desktop avidemux.spec Added Files: avidemux-2.4.3-ppc.patch avidemux-2.4.3-qt4.patch Removed Files: avidemux-2.4-ppc-libmad.patch avidemux-2.4.1-qt4.patch avidemux-2.4.3-lrelease.patch avidemux-2.4.3-ppc-ptr.patch Log Message: Add new ppc patch from avidemux forums, remove outdated libmad patch avidemux-2.4.3-ppc.patch: --- NEW FILE avidemux-2.4.3-ppc.patch --- --- ConfigureChecks.cmake (revision 4376) +++ ConfigureChecks.cmake (working copy) @@ -32,6 +32,9 @@ SET(ADM_CPU_X86_64 1) ELSEIF (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ppc") SET(ADM_CPU_PPC 1) + ELSEIF (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ppc64") + SET(ADM_CPU_PPC 1) + SET(ARCH_64_BITS 1) ENDIF (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "i386" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "i586" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "i686") ENDIF (WIN32) avidemux-2.4.3-qt4.patch: --- NEW FILE avidemux-2.4.3-qt4.patch --- --- cmake/Ts.cmake.orig 2008-09-26 20:37:17.000000000 -0400 +++ cmake/Ts.cmake 2008-09-26 20:37:20.000000000 -0400 @@ -14,7 +14,7 @@ MACRO(FIND_LRELEASE) IF(NOT LRELEASE_EXECUTABLE AND NOT LRELEASE_NOT_FOUND) - FIND_PROGRAM(LRELEASE_EXECUTABLE lrelease PATHS + FIND_PROGRAM(LRELEASE_EXECUTABLE lrelease-qt4 PATHS "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin" "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin" $ENV{QTDIR}/bin) avidemux-2.4-i18n.patch: Index: avidemux-2.4-i18n.patch =================================================================== RCS file: /cvs/free/rpms/avidemux/devel/avidemux-2.4-i18n.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- avidemux-2.4-i18n.patch 16 Aug 2008 16:50:48 -0000 1.1 +++ avidemux-2.4-i18n.patch 27 Sep 2008 00:42:06 -0000 1.2 @@ -1,6 +1,6 @@ -diff -ur avidemux_2.4.orig/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp avidemux_2.4/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp ---- avidemux_2.4.orig/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp 2007-10-16 21:23:21.000000000 +0300 -+++ avidemux_2.4/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp 2007-12-28 20:35:30.000000000 +0200 +diff -ur avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp +--- avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp 2007-10-16 21:23:21.000000000 +0300 ++++ avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp 2007-12-28 20:35:30.000000000 +0200 @@ -53,7 +53,7 @@ { printf("\n[Locale] Locale: %s\n", QLocale::system().name().toUtf8().constData()); @@ -10,9 +10,9 @@ loadTranslation(&qtTranslator, appdir + "qt_" + QLocale::system().name()); loadTranslation(&avidemuxTranslator, appdir + "avidemux_" + QLocale::system().name()); -diff -ur avidemux_2.4.orig/cmake/Ts.cmake avidemux_2.4/cmake/Ts.cmake ---- avidemux_2.4.orig/cmake/Ts.cmake 2007-10-14 14:58:28.000000000 +0300 -+++ avidemux_2.4/cmake/Ts.cmake 2007-12-28 20:36:05.000000000 +0200 +diff -ur cmake/Ts.cmake cmake/Ts.cmake +--- cmake/Ts.cmake 2007-10-14 14:58:28.000000000 +0300 ++++ cmake/Ts.cmake 2007-12-28 20:36:05.000000000 +0200 @@ -63,7 +63,7 @@ SET(qm_files ${qm_files} ${_outXml} ${_out}) avidemux-2.4-libdca.patch: Index: avidemux-2.4-libdca.patch =================================================================== RCS file: /cvs/free/rpms/avidemux/devel/avidemux-2.4-libdca.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- avidemux-2.4-libdca.patch 16 Aug 2008 16:50:48 -0000 1.1 +++ avidemux-2.4-libdca.patch 27 Sep 2008 00:42:06 -0000 1.2 @@ -1,6 +1,6 @@ -diff -p -up avidemux_2.4.2/avidemux/CMakeLists.txt.libdca avidemux_2.4.2/avidemux/CMakeLists.txt ---- avidemux_2.4.2/avidemux/CMakeLists.txt.libdca 2008-06-28 15:03:51.000000000 +0200 -+++ avidemux_2.4.2/avidemux/CMakeLists.txt 2008-07-24 15:43:18.000000000 +0200 +diff -p -up avidemux/CMakeLists.txt.libdca avidemux/CMakeLists.txt +--- avidemux/CMakeLists.txt.libdca 2008-06-28 15:03:51.000000000 +0200 ++++ avidemux/CMakeLists.txt 2008-07-24 15:43:18.000000000 +0200 @@ -331,7 +331,7 @@ endif(USE_AMR_NB AND NOT USE_LATE_BINDIN #libdts @@ -10,9 +10,9 @@ endif(USE_LIBDCA AND NOT USE_LATE_BINDING) # Lame -diff -p -up avidemux_2.4.2/ConfigureChecks.cmake.libdca avidemux_2.4.2/ConfigureChecks.cmake ---- avidemux_2.4.2/ConfigureChecks.cmake.libdca 2008-07-05 20:24:01.000000000 +0200 -+++ avidemux_2.4.2/ConfigureChecks.cmake 2008-07-24 15:43:18.000000000 +0200 +diff -p -up ConfigureChecks.cmake.libdca ConfigureChecks.cmake +--- ConfigureChecks.cmake.libdca 2008-07-05 20:24:01.000000000 +0200 ++++ ConfigureChecks.cmake 2008-07-24 15:43:18.000000000 +0200 @@ -475,7 +475,7 @@ SET(CMAKE_REQUIRED_LIBRARIES "-lm") IF (USE_LATE_BINDING) CHECK_INCLUDE_FILES(dts.h USE_LIBDCA) @@ -22,9 +22,9 @@ ENDIF (USE_LATE_BINDING) SET(CMAKE_REQUIRED_LIBRARIES) -diff -p -up avidemux_2.4.2/configure.in.in.libdca avidemux_2.4.2/configure.in.in ---- avidemux_2.4.2/configure.in.in.libdca 2008-07-24 15:43:18.000000000 +0200 -+++ avidemux_2.4.2/configure.in.in 2008-07-24 15:51:57.000000000 +0200 +diff -p -up configure.in.in.libdca configure.in.in +--- configure.in.in.libdca 2008-07-24 15:43:18.000000000 +0200 ++++ configure.in.in 2008-07-24 15:51:57.000000000 +0200 @@ -891,18 +891,14 @@ have_libdca=no if test "x$with_libdca" != "xno"; then have_libdca=yes avidemux-2.4.2-pulseaudio-default.patch: Index: avidemux-2.4.2-pulseaudio-default.patch =================================================================== RCS file: /cvs/free/rpms/avidemux/devel/avidemux-2.4.2-pulseaudio-default.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- avidemux-2.4.2-pulseaudio-default.patch 3 Aug 2008 16:47:38 -0000 1.1 +++ avidemux-2.4.2-pulseaudio-default.patch 27 Sep 2008 00:42:06 -0000 1.2 @@ -1,5 +1,5 @@ ---- prefs.in.old 2008-06-22 15:24:53.000000000 -0400 -+++ prefs.in 2008-07-19 21:08:03.000000000 -0400 +--- avidemux/prefs.in.old 2008-06-22 15:24:53.000000000 -0400 ++++ avidemux/prefs.in 2008-07-19 21:08:03.000000000 -0400 @@ -55,7 +55,7 @@ #else device.audiodevice, STRING, ALSA Index: avidemux-gtk.desktop =================================================================== RCS file: /cvs/free/rpms/avidemux/devel/avidemux-gtk.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- avidemux-gtk.desktop 3 Aug 2008 16:47:38 -0000 1.1 +++ avidemux-gtk.desktop 27 Sep 2008 00:42:06 -0000 1.2 @@ -1,6 +1,6 @@ [Desktop Entry] Name=Avidemux Video Editor (GTK) -Comment=Graphical video editing tool +Comment=Graphical video editing tool - GTK interface Icon=gnome-multimedia Exec=avidemux2_gtk Terminal=false Index: avidemux-qt.desktop =================================================================== RCS file: /cvs/free/rpms/avidemux/devel/avidemux-qt.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- avidemux-qt.desktop 3 Aug 2008 16:47:38 -0000 1.1 +++ avidemux-qt.desktop 27 Sep 2008 00:42:06 -0000 1.2 @@ -1,6 +1,6 @@ [Desktop Entry] -Name=Avidemux Video Editor (QT) -Comment=Graphical video editing tool +Name=Avidemux Video Editor (Qt) +Comment=Graphical video editing tool - Qt interface Icon=gnome-multimedia Exec=avidemux2_qt4 Terminal=false Index: avidemux.spec =================================================================== RCS file: /cvs/free/rpms/avidemux/devel/avidemux.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- avidemux.spec 18 Sep 2008 21:00:01 -0000 1.6 +++ avidemux.spec 27 Sep 2008 00:42:06 -0000 1.7 @@ -1,11 +1,9 @@ -%define with_gtk 1 -%define with_qt 1 #define svndate 20080521 Name: avidemux Version: 2.4.3 -Release: 4%{?dist} -Summary: Graphical video editing tool +Release: 5%{?dist} +Summary: Graphical video editing and transcoding tool Group: Applications/Multimedia License: GPLv2+ @@ -14,22 +12,22 @@ Source1: %{name}-gtk.desktop Source2: %{name}-qt.desktop Patch0: avidemux-2.4.2-pulseaudio-default.patch -Patch1: avidemux-2.4.1-qt4.patch +Patch1: avidemux-2.4.3-qt4.patch Patch2: avidemux-2.4-i18n.patch +# http://ftp.ncnu.edu.tw/Linux/Gentoo/gentoo-portage/media-video/avidemux/f... Patch3: avidemux-2.4-libdca.patch -Patch4: avidemux-2.4.3-lrelease.patch -Patch5: avidemux-2.4-ppc-libmad.patch -Patch6: avidemux-2.4.3-ppc-ptr.patch +# http://avidemux.org/admForum/viewtopic.php?pid=29582#p29582 +# http://avidemux.org/admForum/viewtopic.php?id=3991 +Patch4: avidemux-2.4.3-ppc.patch #http://bugs.gentoo.org/attachment.cgi?id=160132&action=view BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: %{name}-gui +Requires: %{name}-cli = %{version} +Requires: %{name}-gui = %{version} # Compiling BuildRequires: cmake BuildRequires: gettext-devel -#BuildRequires: libtool >= 1.5.6 -#BuildRequires: autoconf # Libraries BuildRequires: nasm >= 0.98.38 @@ -82,19 +80,26 @@ MPEG files, MP4 and ASF, using a variety of codecs. Tasks can be automated using projects, job queue and powerful scripting capabilities. -%if %{with_gtk} +%package cli +Summary: CLI for %{name} +Group: Applications/Multimedia +Provides: %{name}-cli = %{version}-%{release} + +%description cli +This package provides command-line interface for %{name} + %package gtk Summary: GTK GUI for %{name} Group: Applications/Multimedia BuildRequires: gtk2-devel >= 2.8.0 BuildRequires: cairo-devel +# Slightly higher so it is default, but it can be avoided by installing +# avidemux-qt directly or it can be removed later once avidemux-qt is installed Provides: %{name}-gui = %{version}-%{release}.1 %description gtk This package provides the GTK interface for %{name} -%endif -%if %{with_qt} %package qt Summary: QT GUI for %{name} Group: Applications/Multimedia @@ -103,21 +108,14 @@ %description qt This package provides the QT interface for %{name} -%endif %prep %setup -q -n avidemux_%{version} -pushd avidemux %patch0 -b .pulse -popd -%patch1 -p1 -b .qt4 -%patch2 -p1 -b .i18n -%patch3 -p1 -b .libdca -%patch4 -b .lrelease -%patch5 -b .ppc_libmad -pushd avidemux/ADM_codecs/ -%patch6 -b .ppc_ptr -popd +%patch1 -b .qt4 +%patch2 -b .i18n +%patch3 -b .libdca +%patch4 -b .ppc %build %cmake @@ -127,17 +125,13 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -%if %{with_gtk} desktop-file-install --vendor livna \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ %{SOURCE1} -%endif -%if %{with_qt} desktop-file-install --vendor livna \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ %{SOURCE2} -%endif find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' %find_lang %{name} @@ -148,24 +142,28 @@ %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog History README TODO -%{_bindir}/avidemux2_cli %{_datadir}/%{name}/ -%if %{with_gtk} +%files cli +%defattr(-,root,root,-) +%{_bindir}/avidemux2_cli + %files gtk %defattr(-,root,root,-) %{_bindir}/avidemux2_gtk %{_datadir}/applications/*gtk*.desktop -%endif -%if %{with_qt} %files qt %defattr(-,root,root,-) %{_bindir}/avidemux2_qt4 %{_datadir}/applications/*qt*.desktop -%endif %changelog +* Thu Sep 18 2008 Stewart Adam <s.adam at diffingo.com> - 2.4.3-5 +- Add CMake patch for PPC64 +- Update patches for 2.4.3 +- Remove outdated libmad patch (Nov. 2007) + * Thu Sep 18 2008 Stewart Adam <s.adam at diffingo.com> - 2.4.3-4 - Add another patch to fix ppc64 build (pointer type), first patch was for libmad --- avidemux-2.4-ppc-libmad.patch DELETED --- --- avidemux-2.4.1-qt4.patch DELETED --- --- avidemux-2.4.3-lrelease.patch DELETED --- --- avidemux-2.4.3-ppc-ptr.patch DELETED ---

16 years, 2 months

1
0
0 / 0

rpms/vlc/devel vlc.spec,1.5,1.6 sources,1.3,1.4 .cvsignore,1.3,1.4

by Nicolas Chauvet

Author: kwizart Update of /cvs/free/rpms/vlc/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv28110 Modified Files: vlc.spec sources .cvsignore Log Message: Update to 0.9.3 Index: vlc.spec =================================================================== RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- vlc.spec 15 Sep 2008 09:29:22 -0000 1.5 +++ vlc.spec 26 Sep 2008 16:22:27 -0000 1.6 @@ -18,7 +18,7 @@ %define _version %{version}-git %define release_tag 0.1.%{vlc_date}git %else -Version: 0.9.2 +Version: 0.9.3 %define _version %{version} %define release_tag 1 %endif @@ -417,7 +417,9 @@ %{_bindir}/svlc %{_bindir}/vlc-wrapper %{_libdir}/vlc/gui/libqt4_plugin.so +%{_libdir}/vlc/access/libaccess_gnomevfs_plugin.so %{_libdir}/vlc/access/libscreen_plugin.so +%{_libdir}/vlc/codec/libfluidsynth_plugin.so %{_libdir}/vlc/misc/libsvg_plugin.so %{_libdir}/vlc/misc/libnotify_plugin.so %{_libdir}/vlc/video_output/libaa_plugin.so @@ -445,7 +447,9 @@ %{_datadir}/vlc/ %{_libdir}/*.so.* %exclude %{_libdir}/vlc/gui/libqt4_plugin.so +%exclude %{_libdir}/vlc/access/libaccess_gnomevfs_plugin.so %exclude %{_libdir}/vlc/access/libscreen_plugin.so +%exclude %{_libdir}/vlc/codec/libfluidsynth_plugin.so %exclude %{_libdir}/vlc/misc/libsvg_plugin.so %exclude %{_libdir}/vlc/misc/libnotify_plugin.so %exclude %{_libdir}/vlc/video_output/libaa_plugin.so @@ -496,6 +500,10 @@ %changelog +* Fri Sep 26 2008 kwizart < kwizart at gmail.com > - 0.9.3-1 +- Update to 0.9.3 (final) +- Few others move from core to main + * Mon Sep 15 2008 kwizart < kwizart at gmail.com > - 0.9.2-1 - Update to 0.9.2 (final) Index: sources =================================================================== RCS file: /cvs/free/rpms/vlc/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 15 Sep 2008 09:24:28 -0000 1.3 +++ sources 26 Sep 2008 16:22:27 -0000 1.4 @@ -1 +1 @@ -f7d843d0725abb57196c4012eeb0e636 vlc-0.9.2.tar.bz2 +f38aa41ad3ac8b411f2d4a12e3525120 vlc-0.9.3.tar.bz2 Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/vlc/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 15 Sep 2008 09:24:28 -0000 1.3 +++ .cvsignore 26 Sep 2008 16:22:27 -0000 1.4 @@ -1 +1 @@ -vlc-0.9.2.tar.bz2 +vlc-0.9.3.tar.bz2

16 years, 2 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

rpmfusion-commits September 2008