rpms/mame/F-14 .cvsignore, 1.24, 1.25 mame-verbosebuild.patch, 1.3, 1.4 mame.spec, 1.29, 1.30 sources, 1.24, 1.25
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/mame/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv6156
Modified Files:
.cvsignore mame-verbosebuild.patch mame.spec sources
Log Message:
* Tue Apr 19 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.142u1-1
- Updated to 0.142u1
- Updated the verbosebuild patch
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-14/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore 3 Apr 2011 16:42:57 -0000 1.24
+++ .cvsignore 19 Apr 2011 19:35:46 -0000 1.25
@@ -1 +1,2 @@
mame0142s.exe
+0142u1_diff.zip
mame-verbosebuild.patch:
makefile | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
Index: mame-verbosebuild.patch
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-14/mame-verbosebuild.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mame-verbosebuild.patch 19 Sep 2010 15:17:30 -0000 1.3
+++ mame-verbosebuild.patch 19 Apr 2011 19:35:47 -0000 1.4
@@ -1,7 +1,7 @@
-diff -up mame-0.139u3/makefile.verbosebuild mame-0.139u3/makefile
---- mame-0.139u3/makefile.verbosebuild 2010-09-19 17:03:31.000000000 +0200
-+++ mame-0.139u3/makefile 2010-09-19 17:12:14.000000000 +0200
-@@ -294,12 +294,12 @@ BUILD_EXE = $(EXE)
+diff -up mame-0.142u1/makefile.verbosebuild mame-0.142u1/makefile
+--- mame-0.142u1/makefile.verbosebuild 2011-04-19 21:29:01.000000000 +0200
++++ mame-0.142u1/makefile 2011-04-19 21:31:40.000000000 +0200
+@@ -297,12 +297,12 @@ BUILD_EXE = $(EXE)
endif
# compiler, linker and utilities
@@ -19,7 +19,7 @@
-@@ -745,12 +745,12 @@ $(OBJ)/%.s: $(SRC)/%.c | $(OSPREBUILD)
+@@ -755,12 +755,12 @@ $(OBJ)/%.s: $(SRC)/%.c | $(OSPREBUILD)
$(OBJ)/%.lh: $(SRC)/%.lay $(FILE2STR_TARGET)
@echo Converting $<...
@@ -33,5 +33,5 @@
+ $(PNG2BDC) $< $(OBJ)/temp.bdc
+ $(FILE2STR) $(OBJ)/temp.bdc $@ font_$(basename $(notdir $<)) UINT8
- $(OBJ)/%.a:
- @echo Archiving $@...
+ $(DRIVLISTOBJ): $(DRIVLISTSRC)
+ @echo Compiling $<...
Index: mame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-14/mame.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- mame.spec 3 Apr 2011 16:42:58 -0000 1.29
+++ mame.spec 19 Apr 2011 19:35:47 -0000 1.30
@@ -5,7 +5,7 @@
%bcond_with debug
%global baseversion 142
-#global sourceupdate 4
+%global sourceupdate 1
Name: mame
%if 0%{?sourceupdate}
@@ -24,9 +24,9 @@
%if 0%{?sourceupdate}
#Source updates
Source1: http://mamedev.org/updates/0%{baseversion}u1_diff.zip
-Source2: http://mamedev.org/updates/0%{baseversion}u2_diff.zip
-Source3: http://mamedev.org/updates/0%{baseversion}u3_diff.zip
-Source4: http://mamedev.org/updates/0%{baseversion}u4_diff.zip
+#Source2: http://mamedev.org/updates/0%{baseversion}u2_diff.zip
+#Source3: http://mamedev.org/updates/0%{baseversion}u3_diff.zip
+#Source4: http://mamedev.org/updates/0%{baseversion}u4_diff.zip
%endif
Patch0: %{name}-fortify.patch
Patch2: %{name}-verbosebuild.patch
@@ -249,6 +249,10 @@
%changelog
+* Tue Apr 19 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.142u1-1
+- Updated to 0.142u1
+- Updated the verbosebuild patch
+
* Sun Apr 03 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.142-1
- Updated to 0.142
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-14/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources 3 Apr 2011 16:42:58 -0000 1.24
+++ sources 19 Apr 2011 19:35:47 -0000 1.25
@@ -1 +1,2 @@
56fa8befc6bc768906e4235ba906453c mame0142s.exe
+f142bbd8c93b401b1579c06e04b4bae5 0142u1_diff.zip
13 years, 7 months
rpms/mame/devel .cvsignore, 1.24, 1.25 mame-verbosebuild.patch, 1.3, 1.4 mame.spec, 1.29, 1.30 sources, 1.24, 1.25
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/mame/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv6044
Modified Files:
.cvsignore mame-verbosebuild.patch mame.spec sources
Log Message:
* Tue Apr 19 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.142u1-1
- Updated to 0.142u1
- Updated the verbosebuild patch
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore 3 Apr 2011 16:42:49 -0000 1.24
+++ .cvsignore 19 Apr 2011 19:35:38 -0000 1.25
@@ -1 +1,2 @@
mame0142s.exe
+0142u1_diff.zip
mame-verbosebuild.patch:
makefile | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
Index: mame-verbosebuild.patch
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/mame-verbosebuild.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mame-verbosebuild.patch 19 Sep 2010 15:17:30 -0000 1.3
+++ mame-verbosebuild.patch 19 Apr 2011 19:35:38 -0000 1.4
@@ -1,7 +1,7 @@
-diff -up mame-0.139u3/makefile.verbosebuild mame-0.139u3/makefile
---- mame-0.139u3/makefile.verbosebuild 2010-09-19 17:03:31.000000000 +0200
-+++ mame-0.139u3/makefile 2010-09-19 17:12:14.000000000 +0200
-@@ -294,12 +294,12 @@ BUILD_EXE = $(EXE)
+diff -up mame-0.142u1/makefile.verbosebuild mame-0.142u1/makefile
+--- mame-0.142u1/makefile.verbosebuild 2011-04-19 21:29:01.000000000 +0200
++++ mame-0.142u1/makefile 2011-04-19 21:31:40.000000000 +0200
+@@ -297,12 +297,12 @@ BUILD_EXE = $(EXE)
endif
# compiler, linker and utilities
@@ -19,7 +19,7 @@
-@@ -745,12 +745,12 @@ $(OBJ)/%.s: $(SRC)/%.c | $(OSPREBUILD)
+@@ -755,12 +755,12 @@ $(OBJ)/%.s: $(SRC)/%.c | $(OSPREBUILD)
$(OBJ)/%.lh: $(SRC)/%.lay $(FILE2STR_TARGET)
@echo Converting $<...
@@ -33,5 +33,5 @@
+ $(PNG2BDC) $< $(OBJ)/temp.bdc
+ $(FILE2STR) $(OBJ)/temp.bdc $@ font_$(basename $(notdir $<)) UINT8
- $(OBJ)/%.a:
- @echo Archiving $@...
+ $(DRIVLISTOBJ): $(DRIVLISTSRC)
+ @echo Compiling $<...
Index: mame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/mame.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- mame.spec 3 Apr 2011 16:42:49 -0000 1.29
+++ mame.spec 19 Apr 2011 19:35:38 -0000 1.30
@@ -5,7 +5,7 @@
%bcond_with debug
%global baseversion 142
-#global sourceupdate 4
+%global sourceupdate 1
Name: mame
%if 0%{?sourceupdate}
@@ -24,9 +24,9 @@
%if 0%{?sourceupdate}
#Source updates
Source1: http://mamedev.org/updates/0%{baseversion}u1_diff.zip
-Source2: http://mamedev.org/updates/0%{baseversion}u2_diff.zip
-Source3: http://mamedev.org/updates/0%{baseversion}u3_diff.zip
-Source4: http://mamedev.org/updates/0%{baseversion}u4_diff.zip
+#Source2: http://mamedev.org/updates/0%{baseversion}u2_diff.zip
+#Source3: http://mamedev.org/updates/0%{baseversion}u3_diff.zip
+#Source4: http://mamedev.org/updates/0%{baseversion}u4_diff.zip
%endif
Patch0: %{name}-fortify.patch
Patch2: %{name}-verbosebuild.patch
@@ -249,6 +249,10 @@
%changelog
+* Tue Apr 19 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.142u1-1
+- Updated to 0.142u1
+- Updated the verbosebuild patch
+
* Sun Apr 03 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.142-1
- Updated to 0.142
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources 3 Apr 2011 16:42:49 -0000 1.24
+++ sources 19 Apr 2011 19:35:38 -0000 1.25
@@ -1 +1,2 @@
56fa8befc6bc768906e4235ba906453c mame0142s.exe
+f142bbd8c93b401b1579c06e04b4bae5 0142u1_diff.zip
13 years, 7 months
rpms/minitube/F-13 .cvsignore, 1.6, 1.7 minitube.spec, 1.7, 1.8 sources, 1.6, 1.7
by Magnus Tuominen
Author: magnu5
Update of /cvs/free/rpms/minitube/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv28039
Modified Files:
.cvsignore minitube.spec sources
Log Message:
* Tue Apr 19 2011 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.4.2-1
- version bump
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/minitube/F-13/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 30 Mar 2011 14:33:23 -0000 1.6
+++ .cvsignore 19 Apr 2011 15:02:30 -0000 1.7
@@ -1 +1 @@
-minitube-1.4.1.tar.gz
+minitube-1.4.2.tar.gz
Index: minitube.spec
===================================================================
RCS file: /cvs/free/rpms/minitube/F-13/minitube.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- minitube.spec 30 Mar 2011 15:37:19 -0000 1.7
+++ minitube.spec 19 Apr 2011 15:02:31 -0000 1.8
@@ -1,6 +1,6 @@
Name: minitube
-Version: 1.4.1
-Release: 2%{?dist}
+Version: 1.4.2
+Release: 1%{?dist}
Summary: A YouTube desktop client
Group: Applications/Multimedia
@@ -121,6 +121,9 @@
%dir %{_datadir}/%{name}/locale
%changelog
+* Tue Apr 19 2011 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.4.2-1
+- version bump
+
* Wed Mar 30 2011 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.4.1-2
- version bump
- new lang patch
Index: sources
===================================================================
RCS file: /cvs/free/rpms/minitube/F-13/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 30 Mar 2011 14:33:23 -0000 1.6
+++ sources 19 Apr 2011 15:02:31 -0000 1.7
@@ -1 +1 @@
-180ba4af94d1de42599b97209187ef51 minitube-1.4.1.tar.gz
+771d6af17fe4e41567d05663fe0db03c minitube-1.4.2.tar.gz
13 years, 7 months
rpms/minitube/F-14 .cvsignore, 1.6, 1.7 minitube.spec, 1.8, 1.9 sources, 1.6, 1.7
by Magnus Tuominen
Author: magnu5
Update of /cvs/free/rpms/minitube/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27871
Modified Files:
.cvsignore minitube.spec sources
Log Message:
* Tue Apr 19 2011 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.4.2-1
- version bump
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/minitube/F-14/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 30 Mar 2011 14:32:23 -0000 1.6
+++ .cvsignore 19 Apr 2011 15:01:21 -0000 1.7
@@ -1 +1 @@
-minitube-1.4.1.tar.gz
+minitube-1.4.2.tar.gz
Index: minitube.spec
===================================================================
RCS file: /cvs/free/rpms/minitube/F-14/minitube.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- minitube.spec 30 Mar 2011 15:36:08 -0000 1.8
+++ minitube.spec 19 Apr 2011 15:01:21 -0000 1.9
@@ -1,6 +1,6 @@
Name: minitube
-Version: 1.4.1
-Release: 2%{?dist}
+Version: 1.4.2
+Release: 1%{?dist}
Summary: A YouTube desktop client
Group: Applications/Multimedia
@@ -121,6 +121,9 @@
%dir %{_datadir}/%{name}/locale
%changelog
+* Tue Apr 19 2011 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.4.2-1
+- version bump
+
* Wed Mar 30 2011 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.4.1-2
- version bump
- new lang patch
Index: sources
===================================================================
RCS file: /cvs/free/rpms/minitube/F-14/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 30 Mar 2011 14:32:23 -0000 1.6
+++ sources 19 Apr 2011 15:01:21 -0000 1.7
@@ -1 +1 @@
-180ba4af94d1de42599b97209187ef51 minitube-1.4.1.tar.gz
+771d6af17fe4e41567d05663fe0db03c minitube-1.4.2.tar.gz
13 years, 7 months
rpms/minitube/devel .cvsignore, 1.6, 1.7 minitube.spec, 1.8, 1.9 sources, 1.6, 1.7
by Magnus Tuominen
Author: magnu5
Update of /cvs/free/rpms/minitube/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25804
Modified Files:
.cvsignore minitube.spec sources
Log Message:
* Tue Apr 19 2011 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.4.2-1
- version bump
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/minitube/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 30 Mar 2011 14:30:59 -0000 1.6
+++ .cvsignore 19 Apr 2011 14:40:54 -0000 1.7
@@ -1 +1 @@
-minitube-1.4.1.tar.gz
+minitube-1.4.2.tar.gz
Index: minitube.spec
===================================================================
RCS file: /cvs/free/rpms/minitube/devel/minitube.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- minitube.spec 30 Mar 2011 14:39:29 -0000 1.8
+++ minitube.spec 19 Apr 2011 14:40:54 -0000 1.9
@@ -1,6 +1,6 @@
Name: minitube
-Version: 1.4.1
-Release: 2%{?dist}
+Version: 1.4.2
+Release: 1%{?dist}
Summary: A YouTube desktop client
Group: Applications/Multimedia
@@ -121,6 +121,9 @@
%dir %{_datadir}/%{name}/locale
%changelog
+* Tue Apr 19 2011 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.4.2-1
+- version bump
+
* Wed Mar 30 2011 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.4.1-2
- version bump
- new lang patch
Index: sources
===================================================================
RCS file: /cvs/free/rpms/minitube/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 30 Mar 2011 14:30:59 -0000 1.6
+++ sources 19 Apr 2011 14:40:54 -0000 1.7
@@ -1 +1 @@
-180ba4af94d1de42599b97209187ef51 minitube-1.4.1.tar.gz
+771d6af17fe4e41567d05663fe0db03c minitube-1.4.2.tar.gz
13 years, 7 months
rpms/avidemux/devel avidemux.spec,1.38,1.39
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/avidemux/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26421
Modified Files:
avidemux.spec
Log Message:
* Sat Apr 16 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.4-2
- Upload missing patch to CVS.
Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/devel/avidemux.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- avidemux.spec 16 Apr 2011 23:46:41 -0000 1.38
+++ avidemux.spec 16 Apr 2011 23:50:19 -0000 1.39
@@ -275,7 +275,7 @@
%{_includedir}/ADM_coreConfig.h
%changelog
-* Sat Apr 15 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.4-2
+* Sat Apr 16 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.4-2
- Upload missing patch to CVS.
* Sat Apr 16 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.4-1
13 years, 7 months
rpms/avidemux/devel avidemux.spec,1.37,1.38
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/avidemux/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25964
Modified Files:
avidemux.spec
Log Message:
* Sat Apr 15 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.4-2
- Upload missing patch to CVS.
Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/devel/avidemux.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- avidemux.spec 16 Apr 2011 23:33:22 -0000 1.37
+++ avidemux.spec 16 Apr 2011 23:46:41 -0000 1.38
@@ -2,7 +2,7 @@
Name: avidemux
Version: 2.5.4
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Graphical video editing and transcoding tool
Group: Applications/Multimedia
@@ -275,6 +275,9 @@
%{_includedir}/ADM_coreConfig.h
%changelog
+* Sat Apr 15 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.4-2
+- Upload missing patch to CVS.
+
* Sat Apr 16 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.4-1
- Updated to version 2.5.4.
13 years, 7 months
rpms/avidemux/devel avidemux_2.5.4-ffmpeg-aac.patch,NONE,1.1
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/avidemux/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25054
Added Files:
avidemux_2.5.4-ffmpeg-aac.patch
Log Message:
Forgot new patch.
avidemux_2.5.4-ffmpeg-aac.patch:
CMakeLists.txt | 9 +++++++++
audioencoder_lavcodec.cpp | 21 ++++++++++++++++-----
2 files changed, 25 insertions(+), 5 deletions(-)
--- NEW FILE avidemux_2.5.4-ffmpeg-aac.patch ---
diff -ur avidemux_2.5.4/plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp avidemux_2.5.4-ffmpeg-aac/plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp
--- avidemux_2.5.4/plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp.ffmpegaac 2010-05-25 16:48:57.000000000 -0400
+++ avidemux_2.5.4/plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp 2010-11-20 16:26:36.756237795 -0500
@@ -25,13 +25,16 @@
#include "ADM_lavcodec.h"
#define Join(x,y) x##_##y
-#if defined(ADM_LAV_MP2) && !defined(ADM_LAV_AC3)
+#if defined(ADM_LAV_MP2) && !defined(ADM_LAV_AC3) && !defined(ADM_LAV_AAC)
#define makeName(x) Join(x,MP2)
#define AUDMEncoder_Lavcodec AUDMEncoder_Lavcodec_MP2
#else
- #if !defined(ADM_LAV_MP2) && defined(ADM_LAV_AC3)
+ #if !defined(ADM_LAV_MP2) && defined(ADM_LAV_AC3) && !defined(ADM_LAV_AAC)
#define makeName(x) Join(x,AC3)
#define AUDMEncoder_Lavcodec AUDMEncoder_Lavcodec_AC3
+ #elif !defined(ADM_LAV_MP2) && !defined(ADM_LAV_AC3) && defined(ADM_LAV_AAC)
+ #define makeName(x) Join(x,AAC)
+ #define AUDMEncoder_Lavcodec AUDMEncoder_Lavcodec_AAC
#else
#error
#endif
@@ -60,13 +63,19 @@
2, // Max channels
1,0,0, // Version
#else
-
-
+#ifdef ADM_LAV_AC3
"LavAC3",
"AC3 (lav)",
"AC3 LavEncoder encoder plugin Mean 2008",
6, // Max channels
1,0,0, // Version
+#else
+ "LavAAC",
+ "AAC (lav)",
+ "AAC LavEncoder encoder plugin Mean 2008",
+ 6, // Max channels
+ 1,0,0, // Version
+#endif
#endif
makeName(WAV),
@@ -132,7 +141,9 @@
#endif
_wavheader->byterate=(lavConfig.bitrate*1000)>>3;
-#ifdef ADM_LAV_MP2
+#if defined(ADM_LAV_AAC)
+ _chunk = 1024*_wavheader->channels;
+#elif defined(ADM_LAV_MP2)
_chunk = 1152*_wavheader->channels;
#else
_chunk = 1536*_wavheader->channels; // AC3
diff -ur avidemux_2.5.4/plugins/ADM_audioEncoders/lavcodec/CMakeLists.txt avidemux_2.5.4-ffmpeg-aac/plugins/ADM_audioEncoders/lavcodec/CMakeLists.txt
--- avidemux_2.5.4/plugins/ADM_audioEncoders/lavcodec/CMakeLists.txt.ffmpegaac 2010-05-25 16:48:57.000000000 -0400
+++ avidemux_2.5.4/plugins/ADM_audioEncoders/lavcodec/CMakeLists.txt 2010-11-20 16:24:10.171164293 -0500
@@ -27,3 +27,12 @@
INIT_AUDIO_ENCODER(ADM_ae_lav_ac3)
INSTALL_AUDIOENCODER(ADM_ae_lav_ac3)
+
+ SET(ADM_ae_lav_aac_SRCS audioencoder_lavcodec.cpp)
+
+ ADD_LIBRARY(ADM_ae_lav_aac SHARED ${ADM_ae_lav_aac_SRCS})
+ ADD_TARGET_CFLAGS(ADM_ae_lav_aac "-DADM_LAV_AAC")
+ TARGET_LINK_LIBRARIES(ADM_ae_lav_aac ADM_core ADM_coreAudio ADM_coreUI ADM_libavcodec ADM_libavutil)
+
+ INIT_AUDIO_ENCODER(ADM_ae_lav_aac)
+ INSTALL_AUDIOENCODER(ADM_ae_lav_aac)
13 years, 7 months
rpms/avidemux/devel avidemux.spec,1.36,1.37 sources,1.7,1.8
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/avidemux/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24553
Modified Files:
avidemux.spec sources
Log Message:
* Sat Apr 16 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.4-1
- Updated to version 2.5.4.
Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/devel/avidemux.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- avidemux.spec 27 Mar 2011 17:00:25 -0000 1.36
+++ avidemux.spec 16 Apr 2011 23:33:22 -0000 1.37
@@ -1,8 +1,8 @@
%define _pkgbuilddir %{_builddir}/%{name}_%{version}
Name: avidemux
-Version: 2.5.3
-Release: 5%{?dist}
+Version: 2.5.4
+Release: 1%{?dist}
Summary: Graphical video editing and transcoding tool
Group: Applications/Multimedia
@@ -33,25 +33,25 @@
Patch2: avidemux-2.4-qt4.patch
# Prevents avidemux from creating the symlinks for .so files, which we do below
Patch3: avidemux-2.5.3-tmplinktarget.patch
-# Fixes multiple definitions of mjpeg_log
-# http://fixounet.free.fr/2.6/2.5.3_mjpeg_fix.diff
-Patch4: 2.5.3_mjpeg_fix.diff
# libADM_xvidRateCtl.so and libADM_vidEnc_pluginOptions.so are supposed to be
# build statically according to upstream... Let's get them installed instead
-Patch5: avidemux-2.5.3-mpeg2enc.patch
-Patch6: avidemux-2.5.3-pluginlibs.patch
+Patch4: avidemux-2.5.3-mpeg2enc.patch
+Patch5: avidemux-2.5.3-pluginlibs.patch
+# Patch8 obtained from http://lists.rpmfusion.org/pipermail/rpmfusion-developers/2010-October/00...
+Patch6: avidemux_2.5.4-ffmpeg-aac.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# Upstream has been informed http://avidemux.org/admForum/viewtopic.php?id=6447
ExcludeArch: ppc ppc64
Requires: %{name}-cli = %{version}-%{release}
-Requires: %{name}-gui = %{version}-%{release}
+Requires: %{name}-gui = %{version}
Requires: %{name}-plugins = %{version}
# Compiling
BuildRequires: cmake
BuildRequires: gettext-devel
+BuildRequires: libxslt
# Libraries
BuildRequires: yasm-devel
@@ -171,10 +171,9 @@
%patch1 -p1 -b .pulse
%patch2 -p1 -b .qt4
%patch3 -p1 -b .tmplinktarget
-%patch4 -p1 -b .mjpeg_log
-%patch5 -p1 -b .mpeg2enc
-%patch6 -p1 -b .pluginlibs
-
+%patch4 -p1 -b .mpeg2enc
+%patch5 -p1 -b .pluginlibs
+%patch6 -p1 -b .ffmpegaac
%build
# Out of source build
@@ -211,6 +210,11 @@
# Find and remove all la files
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
+# Remove Windows-only executables
+# Must check this for new Linux-relevant files upon new avidemux releases
+rm -rf $RPM_BUILD_ROOT%{_datadir}/ADM_addons/avsfilter
+rmdir $RPM_BUILD_ROOT%{_datadir}/ADM_addons/
+
# Install .desktop shortcuts
desktop-file-install --vendor rpmfusion \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
@@ -220,6 +224,15 @@
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
%{SOURCE2}
+# Remove duplicated Qt translations
+rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/i18n/qt_*.qm
+# find_lang.sh doesn't recognize this one, and there already is avidemux_sr.qm
+rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/i18n/avidemux_sr(a)latin.qm
+
+# Qt-style translations
+%find_lang %{name} --with-qt --without-mo
+mv -f %{name}.lang %{name}-qt.lang
+# Gettext-style translations
%find_lang %{name}
%clean
@@ -232,9 +245,8 @@
%defattr(-,root,root,-)
# metapackage, no files
-%files libs -f %{name}.lang
+%files libs
%doc AUTHORS COPYING README TODO
-%dir %{_datadir}/%{name}
%{_datadir}/ADM_scripts/
%{_datadir}/pixmaps/avidemux.png
%{_libdir}/libADM*
@@ -243,16 +255,16 @@
%defattr(-,root,root,-)
%{_bindir}/avidemux2_cli
-%files gtk
+%files gtk -f %{name}.lang
%defattr(-,root,root,-)
%{_bindir}/avidemux2_gtk
%{_datadir}/applications/*gtk*.desktop
-%files qt
+%files qt -f %{name}-qt.lang
%defattr(-,root,root,-)
-%{_datadir}/%{name}/i18n/
%{_bindir}/avidemux2_qt4
%{_datadir}/applications/*qt*.desktop
+%dir %{_datadir}/%{name}/i18n
%files plugins
%defattr(-,root,root,-)
@@ -263,6 +275,9 @@
%{_includedir}/ADM_coreConfig.h
%changelog
+* Sat Apr 16 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.4-1
+- Updated to version 2.5.4.
+
* Sun Mar 27 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 2.5.3-5
- Rebuild for x264
Index: sources
===================================================================
RCS file: /cvs/free/rpms/avidemux/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 27 May 2010 02:05:52 -0000 1.7
+++ sources 16 Apr 2011 23:33:22 -0000 1.8
@@ -1 +1 @@
-5a688029895b66b65ca86b7c85a03ee3 avidemux_2.5.3.tar.gz
+b849460f6480df92bfd72d1a3dc288d4 avidemux_2.5.4.tar.gz
13 years, 7 months
rpms/nvidia-kmod/devel nvidia-kmod.spec, 1.73, 1.74 sources, 1.28, 1.29 .cvsignore, 1.28, 1.29
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv4327
Modified Files:
nvidia-kmod.spec sources .cvsignore
Log Message:
Update to 270.41.03
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nvidia-kmod.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- nvidia-kmod.spec 3 Mar 2011 20:39:33 -0000 1.73
+++ nvidia-kmod.spec 16 Apr 2011 13:28:56 -0000 1.74
@@ -7,7 +7,7 @@
Name: nvidia-kmod
Epoch: 1
-Version: 270.30
+Version: 270.41.03
# Taken over by kmodtool
Release: 1%{?dist}
Summary: NVIDIA display driver kernel module
@@ -86,6 +86,9 @@
%changelog
+* Tue Apr 12 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1:270.41.03-1
+- Update to 270.41.03
+
* Thu Mar 03 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1:270.30-1
- Update to 270.30
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources 3 Mar 2011 20:39:33 -0000 1.28
+++ sources 16 Apr 2011 13:28:56 -0000 1.29
@@ -1 +1 @@
-c0cc5429376a739f14b16e515cf712f7 nvidia-kmod-data-270.30.tar.bz2
+8f676223e8ff1f6c2c37be7378abab16 nvidia-kmod-data-270.41.03.tar.bz2
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore 3 Mar 2011 20:39:33 -0000 1.28
+++ .cvsignore 16 Apr 2011 13:28:56 -0000 1.29
@@ -1 +1 @@
-nvidia-kmod-data-270.30.tar.bz2
+nvidia-kmod-data-270.41.03.tar.bz2
13 years, 7 months