rpms/gpac/devel gpac.spec,1.25,1.26
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/gpac/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv1278/devel
Modified Files:
gpac.spec
Log Message:
Rebuild for js-devel (attempt)
Index: gpac.spec
===================================================================
RCS file: /cvs/free/rpms/gpac/devel/gpac.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- gpac.spec 10 Mar 2011 16:42:35 -0000 1.25
+++ gpac.spec 5 Jun 2011 12:15:24 -0000 1.26
@@ -10,14 +10,14 @@
%global cvs 20100527
# Mozilla stuff fails. It's completely disabled for now.
%global mozver 3.0
-%global geckover 1.9.1
+%global geckover 2.0.0
%global xuldir %{_datadir}/idl/xulrunner-sdk-%{geckover}
%global xulbindir %{_libdir}/xulrunner-%{geckover}
Name: gpac
Summary: MPEG-4 multimedia framework
Version: 0.4.6
-Release: 0.12.cvs%{?cvs}%{?dist}
+Release: 0.13.cvs%{?cvs}%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
URL: http://gpac.sourceforge.net/
@@ -336,6 +336,9 @@
%changelog
+* Sun Jun 05 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 0.4.6-0.13.cvs20100527
+- Rebuild for js update
+
* Thu Mar 10 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 0.4.6-0.12.cvs20100527
- Rebuilt for openjpeg
- Remove usage of --warn-common as LDFLAGS
12 years, 10 months
rpms/gpac/F-15 gpac.spec,1.25,1.26
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/gpac/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv1278/F-15
Modified Files:
gpac.spec
Log Message:
Rebuild for js-devel (attempt)
Index: gpac.spec
===================================================================
RCS file: /cvs/free/rpms/gpac/F-15/gpac.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- gpac.spec 10 Mar 2011 16:42:35 -0000 1.25
+++ gpac.spec 5 Jun 2011 12:15:25 -0000 1.26
@@ -10,14 +10,14 @@
%global cvs 20100527
# Mozilla stuff fails. It's completely disabled for now.
%global mozver 3.0
-%global geckover 1.9.1
+%global geckover 2.0.0
%global xuldir %{_datadir}/idl/xulrunner-sdk-%{geckover}
%global xulbindir %{_libdir}/xulrunner-%{geckover}
Name: gpac
Summary: MPEG-4 multimedia framework
Version: 0.4.6
-Release: 0.12.cvs%{?cvs}%{?dist}
+Release: 0.13.cvs%{?cvs}%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
URL: http://gpac.sourceforge.net/
@@ -336,6 +336,9 @@
%changelog
+* Sun Jun 05 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 0.4.6-0.13.cvs20100527
+- Rebuild for js update
+
* Thu Mar 10 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 0.4.6-0.12.cvs20100527
- Rebuilt for openjpeg
- Remove usage of --warn-common as LDFLAGS
12 years, 10 months
rpms/devede/devel devede-3.16.9-ac3.patch, NONE, 1.1 devede.spec, 1.22, 1.23
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/devede/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv14625
Modified Files:
devede.spec
Added Files:
devede-3.16.9-ac3.patch
Log Message:
* Sat Jun 04 2011 Andrea Musuruane <musuruan(a)gmail.com> 3.16.9-2
- Added a patch to use the ac3_fixed codec in new mencoder
devede-3.16.9-ac3.patch:
devede_video_convert.py | 2 +-
devede_xml_menu.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE devede-3.16.9-ac3.patch ---
diff -durN devede-3.16.9.orig/devede_video_convert.py devede-3.16.9/devede_video_convert.py
--- devede-3.16.9.orig/devede_video_convert.py 2010-04-18 22:27:34.000000000 +0200
+++ devede-3.16.9/devede_video_convert.py 2011-06-04 14:40:06.980318194 +0200
@@ -464,7 +464,7 @@
if(copy_audio==False):
lavcopts+=":acodec="
if disctype=="dvd":
- lavcopts+="ac3"
+ lavcopts+="ac3_fixed"
else:
lavcopts+="mp2"
lavcopts+=":abitrate="+str(audiorate)
diff -durN devede-3.16.9.orig/devede_xml_menu.py devede-3.16.9/devede_xml_menu.py
--- devede-3.16.9.orig/devede_xml_menu.py 2010-01-27 23:52:18.000000000 +0100
+++ devede-3.16.9/devede_xml_menu.py 2011-06-04 14:40:17.817404921 +0200
@@ -884,7 +884,7 @@
lavcopts=""
lavcopts+="vcodec=mpeg2video:sc_threshold=1000000000:cgop:trell:mbd=2:vstrict=0:"
lavcopts+="vrc_maxrate=7000:vrc_buf_size=1835:vbitrate=1000:keyint=12:"
- lavcopts+="acodec=ac3:abitrate=128:aspect="+wide
+ lavcopts+="acodec=ac3_fixed:abitrate=128:aspect="+wide
command_var.append(lavcopts)
command_var.append("-o")
command_var.append(currentfile)
Index: devede.spec
===================================================================
RCS file: /cvs/free/rpms/devede/devel/devede.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- devede.spec 3 Jul 2010 16:02:23 -0000 1.22
+++ devede.spec 4 Jun 2011 14:46:40 -0000 1.23
@@ -1,12 +1,16 @@
Name: devede
Version: 3.16.9
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A program to create video DVDs and CDs (VCD, sVCD or CVD)
Group: Applications/Multimedia
License: GPLv3+
URL: http://www.rastersoft.com/programas/devede.html
Source0: http://www.rastersoft.com/descargas/%{name}-%{version}.tar.bz2
+# Use the ac3_fixed codec in new mencoder
+# http://groups.google.com/group/devede-forum/browse_thread/thread/fe52bf7f...
+Patch0: %{name}-3.16.9-ac3.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -36,6 +40,7 @@
%prep
%setup -q
+%patch0 -p1
# Fix module directory
sed -i 's!/usr/lib/!%{_datadir}/!' devede.py
@@ -110,6 +115,9 @@
%changelog
+* Sat Jun 04 2011 Andrea Musuruane <musuruan(a)gmail.com> 3.16.9-2
+- Added a patch to use the ac3_fixed codec in new mencoder
+
* Sat Jul 03 2010 Andrea Musuruane <musuruan(a)gmail.com> 3.16.9-1
- Updated to version 3.16.9
- Fixed help directory
12 years, 10 months
rpms/devede/F-15 devede-3.16.9-ac3.patch, NONE, 1.1 devede.spec, 1.22, 1.23
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/devede/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv14213
Modified Files:
devede.spec
Added Files:
devede-3.16.9-ac3.patch
Log Message:
* Sat Jun 04 2011 Andrea Musuruane <musuruan(a)gmail.com> 3.16.9-2
- Added a patch to use the ac3_fixed codec in new mencoder
devede-3.16.9-ac3.patch:
devede_video_convert.py | 2 +-
devede_xml_menu.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE devede-3.16.9-ac3.patch ---
diff -durN devede-3.16.9.orig/devede_video_convert.py devede-3.16.9/devede_video_convert.py
--- devede-3.16.9.orig/devede_video_convert.py 2010-04-18 22:27:34.000000000 +0200
+++ devede-3.16.9/devede_video_convert.py 2011-06-04 14:40:06.980318194 +0200
@@ -464,7 +464,7 @@
if(copy_audio==False):
lavcopts+=":acodec="
if disctype=="dvd":
- lavcopts+="ac3"
+ lavcopts+="ac3_fixed"
else:
lavcopts+="mp2"
lavcopts+=":abitrate="+str(audiorate)
diff -durN devede-3.16.9.orig/devede_xml_menu.py devede-3.16.9/devede_xml_menu.py
--- devede-3.16.9.orig/devede_xml_menu.py 2010-01-27 23:52:18.000000000 +0100
+++ devede-3.16.9/devede_xml_menu.py 2011-06-04 14:40:17.817404921 +0200
@@ -884,7 +884,7 @@
lavcopts=""
lavcopts+="vcodec=mpeg2video:sc_threshold=1000000000:cgop:trell:mbd=2:vstrict=0:"
lavcopts+="vrc_maxrate=7000:vrc_buf_size=1835:vbitrate=1000:keyint=12:"
- lavcopts+="acodec=ac3:abitrate=128:aspect="+wide
+ lavcopts+="acodec=ac3_fixed:abitrate=128:aspect="+wide
command_var.append(lavcopts)
command_var.append("-o")
command_var.append(currentfile)
Index: devede.spec
===================================================================
RCS file: /cvs/free/rpms/devede/F-15/devede.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- devede.spec 3 Jul 2010 16:02:23 -0000 1.22
+++ devede.spec 4 Jun 2011 14:45:09 -0000 1.23
@@ -1,12 +1,16 @@
Name: devede
Version: 3.16.9
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A program to create video DVDs and CDs (VCD, sVCD or CVD)
Group: Applications/Multimedia
License: GPLv3+
URL: http://www.rastersoft.com/programas/devede.html
Source0: http://www.rastersoft.com/descargas/%{name}-%{version}.tar.bz2
+# Use the ac3_fixed codec in new mencoder
+# http://groups.google.com/group/devede-forum/browse_thread/thread/fe52bf7f...
+Patch0: %{name}-3.16.9-ac3.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -36,6 +40,7 @@
%prep
%setup -q
+%patch0 -p1
# Fix module directory
sed -i 's!/usr/lib/!%{_datadir}/!' devede.py
@@ -110,6 +115,9 @@
%changelog
+* Sat Jun 04 2011 Andrea Musuruane <musuruan(a)gmail.com> 3.16.9-2
+- Added a patch to use the ac3_fixed codec in new mencoder
+
* Sat Jul 03 2010 Andrea Musuruane <musuruan(a)gmail.com> 3.16.9-1
- Updated to version 3.16.9
- Fixed help directory
12 years, 10 months
rpms/avidemux/F-15 avidemux.spec,1.50,1.51
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/avidemux/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv5173
Modified Files:
avidemux.spec
Log Message:
* Sat Jun 04 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.4-11
- New version of js in Fedora 15 breaks build. (BZ#1756)
- Re-enable built-in javascript for Fedora 15.
- Use system libass (subtitles).
- Use system liba52 (ac3 decoding).
- Use system libmad.
- Use system libtwolame.
Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/F-15/avidemux.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- avidemux.spec 4 Jun 2011 12:53:49 -0000 1.50
+++ avidemux.spec 4 Jun 2011 12:54:40 -0000 1.51
@@ -2,7 +2,7 @@
Name: avidemux
Version: 2.5.4
-Release: 10%{?dist}
+Release: 11%{?dist}
Summary: Graphical video editing and transcoding tool
Group: Applications/Multimedia
12 years, 10 months
rpms/avidemux/F-15 avidemux.spec,1.49,1.50
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/avidemux/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv5059
Modified Files:
avidemux.spec
Log Message:
* Sat Jun 04 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.4-11
- New version of js in Fedora 15 breaks build. (BZ#1756)
- Re-enable built-in javascript for Fedora 15.
- Use system libass (subtitles).
- Use system liba52 (ac3 decoding).
- Use system libmad.
- Use system libtwolame.
Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/F-15/avidemux.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- avidemux.spec 4 Jun 2011 12:45:46 -0000 1.49
+++ avidemux.spec 4 Jun 2011 12:53:49 -0000 1.50
@@ -320,11 +320,9 @@
%{_includedir}/ADM_coreConfig.h
%changelog
-* Sat Jun 04 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.4-10
-- New version of js in Fedora 15 breaks build.
+* Sat Jun 04 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.4-11
+- New version of js in Fedora 15 breaks build. (BZ#1756)
- Re-enable built-in javascript for Fedora 15.
-
-* Wed May 26 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.4-8
- Use system libass (subtitles).
- Use system liba52 (ac3 decoding).
- Use system libmad.
12 years, 10 months
rpms/avidemux/F-15 avidemux-2.5.4-liba52.patch, NONE, 1.1 avidemux-2.5.4-libass.patch, NONE, 1.1 avidemux-2.5.4-libmad.patch, NONE, 1.1 avidemux-2.5.4-libtwolame.patch, NONE, 1.1
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/avidemux/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv4540
Added Files:
avidemux-2.5.4-liba52.patch avidemux-2.5.4-libass.patch
avidemux-2.5.4-libmad.patch avidemux-2.5.4-libtwolame.patch
Log Message:
* Sat Jun 04 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.4-10
- New version of js in Fedora 15 breaks build.
- Re-enable built-in javascript for Fedora 15.
avidemux-2.5.4-liba52.patch:
ADM_ad_a52.cpp | 4 ++--
CMakeLists.txt | 5 +++--
2 files changed, 5 insertions(+), 4 deletions(-)
--- NEW FILE avidemux-2.5.4-liba52.patch ---
diff -Naur avidemux_2.5.4.orig/plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_ad_a52.cpp avidemux_2.5.4/plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_ad_a52.cpp
--- avidemux_2.5.4.orig/plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_ad_a52.cpp 2010-03-15 13:30:11.000000000 -0500
+++ avidemux_2.5.4/plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_ad_a52.cpp 2011-05-26 13:26:08.620994308 -0500
@@ -18,8 +18,8 @@
#include "ADM_ad_plugin.h"
#include "ADM_audioCodecEnum.h"
extern "C" {
-#include "ADM_liba52/a52.h"
-#include "ADM_liba52/mm_accel.h"
+#include <a52dec/a52.h>
+#include <a52dec/mm_accel.h>
};
#define AC3_HANDLE ((a52_state_t *)ac3_handle)
diff -Naur avidemux_2.5.4.orig/plugins/ADM_audioDecoders/ADM_ad_ac3/CMakeLists.txt avidemux_2.5.4/plugins/ADM_audioDecoders/ADM_ad_ac3/CMakeLists.txt
--- avidemux_2.5.4.orig/plugins/ADM_audioDecoders/ADM_ad_ac3/CMakeLists.txt 2008-07-16 12:40:07.000000000 -0500
+++ avidemux_2.5.4/plugins/ADM_audioDecoders/ADM_ad_ac3/CMakeLists.txt 2011-05-26 13:24:40.789865387 -0500
@@ -1,11 +1,12 @@
INCLUDE(ad_plugin)
-ADD_SUBDIRECTORY(ADM_liba52)
+#ADD_SUBDIRECTORY(ADM_liba52)
SET(ADM_ad_a52_SRCS ADM_ad_a52.cpp)
ADD_LIBRARY(ADM_ad_a52 SHARED ${ADM_ad_a52_SRCS})
-TARGET_LINK_LIBRARIES(ADM_ad_a52 ADM_liba52)
+FIND_LIBRARY(LIBA52 a52)
+TARGET_LINK_LIBRARIES(ADM_ad_a52 ${LIBA52})
INIT_AUDIO_PLUGIN(ADM_ad_a52)
INSTALL_AUDIODECODER(ADM_ad_a52)
avidemux-2.5.4-libass.patch:
ADM_vidASS.h | 2 +-
CMakeLists.txt | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
--- NEW FILE avidemux-2.5.4-libass.patch ---
diff -Naur avidemux_2.5.4.orig/plugins/ADM_videoFilters/Ass/ADM_vidASS.h avidemux_2.5.4/plugins/ADM_videoFilters/Ass/ADM_vidASS.h
--- avidemux_2.5.4.orig/plugins/ADM_videoFilters/Ass/ADM_vidASS.h 2010-01-09 05:03:17.000000000 -0600
+++ avidemux_2.5.4/plugins/ADM_videoFilters/Ass/ADM_vidASS.h 2011-05-25 14:27:23.828297237 -0500
@@ -14,7 +14,7 @@
extern "C"
{
-#include "ADM_libAss/ass.h"
+#include <ass/ass.h>
}
#include "ADM_vidAss_Params.h"
class ADMVideoSubASS : public AVDMGenericVideoStream
diff -Naur avidemux_2.5.4.orig/plugins/ADM_videoFilters/Ass/CMakeLists.txt avidemux_2.5.4/plugins/ADM_videoFilters/Ass/CMakeLists.txt
--- avidemux_2.5.4.orig/plugins/ADM_videoFilters/Ass/CMakeLists.txt 2010-01-09 05:03:17.000000000 -0600
+++ avidemux_2.5.4/plugins/ADM_videoFilters/Ass/CMakeLists.txt 2011-05-25 15:45:05.219501216 -0500
@@ -2,13 +2,14 @@
checkFreeType()
IF (USE_FREETYPE)
- ADD_SUBDIRECTORY(ADM_libAss)
+ #ADD_SUBDIRECTORY(ADM_libAss)
INCLUDE(vf_plugin)
SET(ADM_vf_ssa_SRCS ADM_vidASS.cpp)
ADD_LIBRARY(ADM_vf_ssa SHARED ${ADM_vf_ssa_SRCS})
- TARGET_LINK_LIBRARIES(ADM_vf_ssa ADM_libass)
+ FIND_LIBRARY(LIBASS ass)
+ TARGET_LINK_LIBRARIES(ADM_vf_ssa ${LIBASS})
ADD_TARGET_CFLAGS(ADM_vf_ssa "-DCONFIG_FREETYPE=1")
ADD_TARGET_LDFLAGS(ADM_vf_ssa "${FREETYPE2_LDFLAGS}")
avidemux-2.5.4-libmad.patch:
ADM_ad_mad.cpp | 2 +-
CMakeLists.txt | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
--- NEW FILE avidemux-2.5.4-libmad.patch ---
diff -Naur avidemux_2.5.4.orig/plugins/ADM_audioDecoders/ADM_ad_mad/ADM_ad_mad.cpp avidemux_2.5.4/plugins/ADM_audioDecoders/ADM_ad_mad/ADM_ad_mad.cpp
--- avidemux_2.5.4.orig/plugins/ADM_audioDecoders/ADM_ad_mad/ADM_ad_mad.cpp 2009-08-12 13:12:50.000000000 -0500
+++ avidemux_2.5.4/plugins/ADM_audioDecoders/ADM_ad_mad/ADM_ad_mad.cpp 2011-05-26 13:34:21.972858642 -0500
@@ -17,7 +17,7 @@
#include "ADM_default.h"
#include "ADM_ad_plugin.h"
#include "ADM_audioCodecEnum.h"
-#include "ADM_libMad/mad.h"
+#include <mad.h>
#define Stream ((mad_stream *)_stream)
#define Frame ((mad_frame *)_frame)
diff -Naur avidemux_2.5.4.orig/plugins/ADM_audioDecoders/ADM_ad_mad/CMakeLists.txt avidemux_2.5.4/plugins/ADM_audioDecoders/ADM_ad_mad/CMakeLists.txt
--- avidemux_2.5.4.orig/plugins/ADM_audioDecoders/ADM_ad_mad/CMakeLists.txt 2008-07-16 12:40:07.000000000 -0500
+++ avidemux_2.5.4/plugins/ADM_audioDecoders/ADM_ad_mad/CMakeLists.txt 2011-05-26 13:32:24.292708724 -0500
@@ -8,12 +8,13 @@
ADD_DEFINITIONS("-DFPM_PPC")
ENDIF (ADM_CPU_X86_32)
-ADD_SUBDIRECTORY(ADM_libMad)
+#ADD_SUBDIRECTORY(ADM_libMad)
SET(ADM_ad_Mad_SRCS ADM_ad_mad.cpp)
ADD_LIBRARY(ADM_ad_Mad SHARED ${ADM_ad_Mad_SRCS})
-TARGET_LINK_LIBRARIES(ADM_ad_Mad ADM_libMad)
+FIND_LIBRARY(LIBMAD mad)
+TARGET_LINK_LIBRARIES(ADM_ad_Mad ${LIBMAD})
INIT_AUDIO_PLUGIN(ADM_ad_Mad)
INSTALL_AUDIODECODER(ADM_ad_Mad)
avidemux-2.5.4-libtwolame.patch:
CMakeLists.txt | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
--- NEW FILE avidemux-2.5.4-libtwolame.patch ---
diff -Naur avidemux_2.5.4.orig/plugins/ADM_audioEncoders/twolame/CMakeLists.txt avidemux_2.5.4/plugins/ADM_audioEncoders/twolame/CMakeLists.txt
--- avidemux_2.5.4.orig/plugins/ADM_audioEncoders/twolame/CMakeLists.txt 2010-05-25 15:48:57.000000000 -0500
+++ avidemux_2.5.4/plugins/ADM_audioEncoders/twolame/CMakeLists.txt 2011-05-26 12:39:31.025294147 -0500
@@ -1,12 +1,13 @@
INCLUDE(ae_plugin)
- subdirs(PREORDER ADM_libtwolame)
+ #subdirs(PREORDER ADM_libtwolame)
SET(ADM_ae_twolame_SRCS audioencoder_twolame.cpp)
ADD_LIBRARY(ADM_ae_twolame SHARED ${ADM_ae_twolame_SRCS})
- TARGET_LINK_LIBRARIES(ADM_ae_twolame ADM_libtwolame ADM_coreAudio ADM_coreUI)
- include_directories(ADM_libtwolame)
+ FIND_LIBRARY(LIBTWOLAME twolame)
+ TARGET_LINK_LIBRARIES(ADM_ae_twolame ${LIBTWOLAME} ADM_coreAudio ADM_coreUI)
+ #include_directories(ADM_libtwolame)
INIT_AUDIO_ENCODER(ADM_ae_twolame)
12 years, 10 months
rpms/avidemux/F-15 avidemux.spec,1.48,1.49
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/avidemux/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv4107
Modified Files:
avidemux.spec
Log Message:
* Sat Jun 04 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.4-10
- New version of js in Fedora 15 breaks build.
- Re-enable built-in javascript for Fedora 15.
Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/F-15/avidemux.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- avidemux.spec 31 May 2011 14:39:43 -0000 1.48
+++ avidemux.spec 4 Jun 2011 12:45:46 -0000 1.49
@@ -2,7 +2,7 @@
Name: avidemux
Version: 2.5.4
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: Graphical video editing and transcoding tool
Group: Applications/Multimedia
@@ -43,10 +43,15 @@
Patch8: avidemux-2.5.4-gtk_menu_crash_fix.patch
# Patch needed for version of x264 in F15/rawhide.
Patch9: avidemux-2.5.4-x264_fix.patch
-# Work in progress
-#Patch10: avidemux-2.5.4-ext_lib_cmake_fix.patch
-Patch11: avidemux-2.5.4-audio_prefs.patch
-Patch12: avidemux-2.5.4-ffmpeg_perms.patch
+Patch10: avidemux-2.5.4-audio_prefs.patch
+Patch11: avidemux-2.5.4-ffmpeg_perms.patch
+# Use system libraries
+Patch12: avidemux-2.5.4-libass.patch
+Patch13: avidemux-2.5.4-liba52.patch
+Patch14: avidemux-2.5.4-libmad.patch
+Patch15: avidemux-2.5.4-libtwolame.patch
+# Uses a header file not found in the standard package
+#Patch16: avidemux-2.5.4-mpeg2enc.patch
# Upstream has been informed http://avidemux.org/admForum/viewtopic.php?id=6447
ExcludeArch: ppc ppc64
@@ -70,6 +75,7 @@
BuildRequires: libXmu-devel
BuildRequires: libsamplerate-devel
BuildRequires: jack-audio-connection-kit-devel
+BuildRequires: libass-devel
# Sound out
BuildRequires: alsa-lib-devel >= 1.0.3
@@ -90,12 +96,13 @@
BuildRequires: opencore-amr-devel
# VP8 support, decoding only?
BuildRequires: libvpx-devel
-
+BuildRequires: twolame-devel
# Video Codecs
BuildRequires: xvidcore-devel >= 1.0.2
BuildRequires: x264-devel
BuildRequires: ffmpeg-devel
+#BuildRequires: mjpegtools-devel
# FIXME: aften not packaged, add BR when it is
@@ -172,8 +179,12 @@
%setup -q -n avidemux_%{version}
# Remove unneeded external libraries
-# Currently breaks building if it doesn't exist.
-#rm -rf avidemux/ADM_script
+#rm -rf avidemux/ADM_libraries/ADM_smjs
+rm -rf plugins/ADM_videoFilters/Ass/ADM_libAss
+rm -rf plugins/ADM_audioEncoders/twolame/ADM_libtwolame
+rm -rf plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad
+rm -rf plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52
+#rm -rf plugins/ADM_videoEncoder/ADM_vidEnc_mpeg2enc/mpeg2enc
# change hardcoded libdir paths
%ifarch x86_64 ppc64
@@ -181,6 +192,14 @@
sed -i.bak 's/startDir="lib";/startDir="lib64";/' avidemux/main.cpp
%endif
+# Fix build with version of js introduced in F15.
+#find avidemux/ADM_script -name '*.h' -exec \
+#sed -i -e '/#include "jsapi.h"/ i\
+##undef malloc \
+##undef calloc \
+##undef realloc \
+##undef free' {} \;
+
%patch0 -p1 -b .parallel
%patch1 -p1 -b .pulse
%patch2 -p1 -b .qt4
@@ -191,31 +210,34 @@
%patch7 -p1 -b .gcc46tmpfix
%patch8 -b .gtk_menu
%patch9 -p1 -b .x264fix
-# Fixes cmake configuration but build fails.
-#%patch10 -p1 -b .extlibfix
-%patch11 -p1 -b .audioprefs
-%patch12 -p1 -b .ffmpegperms
+%patch10 -p1 -b .audioprefs
+%patch11 -p1 -b .ffmpegperms
+%patch12 -p1 -b .libass
+%patch13 -p1 -b .liba52
+%patch14 -p1 -b .libmad
+%patch15 -p1 -b .libtwolame
+#%patch16 -p1 -b .mpeg2enc
+
%build
-# Out of source build
-mkdir build && cd build
-%cmake -DAVIDEMUX_INSTALL_PREFIX=%{_prefix} \
- -DAVIDEMUX_SOURCE_DIR="%{_pkgbuilddir}" \
- -DAVIDEMUX_CORECONFIG_DIR="%{_pkgbuilddir}/build/config" \
- -DUSE_SYSTEM_SPIDERMONKEY:BOOL=ON \
+# Cmake requires out of source build
+mkdir -p build && pushd build
+%cmake -DUSE_SYSTEM_SPIDERMONKEY:BOOL=OFF \
..
make %{?_smp_mflags}
# Create the temp link directory manually since otherwise it happens too early
mkdir -p %{_pkgbuilddir}/build/%{_lib}
find %{_pkgbuilddir}/build/avidemux -name '*.so*' | \
xargs ln -sft %{_pkgbuilddir}/build/%{_lib}
+popd
-mkdir ../build_plugins && cd ../build_plugins
+mkdir -p build_plugins && pushd build_plugins
%cmake -DAVIDEMUX_INSTALL_PREFIX="%{_pkgbuilddir}/build/" \
-DAVIDEMUX_SOURCE_DIR="%{_pkgbuilddir}" \
-DAVIDEMUX_CORECONFIG_DIR="%{_pkgbuilddir}/build/config" \
../plugins
make %{?_smp_mflags}
+popd
%install
@@ -223,6 +245,7 @@
make -C build install DESTDIR=$RPM_BUILD_ROOT
make -C build_plugins install DESTDIR=$RPM_BUILD_ROOT
+
# Install the build configuration for devel package
install -d -m755 $RPM_BUILD_ROOT%{_includedir}
install -m644 build/config/ADM_coreConfig.h $RPM_BUILD_ROOT%{_includedir}/ADM_coreConfig.h
@@ -297,11 +320,15 @@
%{_includedir}/ADM_coreConfig.h
%changelog
-* Tue May 31 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.4-9
-- Rebuild for updated js package.
-
-* Sun May 15 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.4-7
-- Rebuild for updated js (spidermonkey)
+* Sat Jun 04 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.4-10
+- New version of js in Fedora 15 breaks build.
+- Re-enable built-in javascript for Fedora 15.
+
+* Wed May 26 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.4-8
+- Use system libass (subtitles).
+- Use system liba52 (ac3 decoding).
+- Use system libmad.
+- Use system libtwolame.
* Sun Apr 24 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.4-6
- Really fix AAC this time.
12 years, 10 months
rpms/avidemux/devel avidemux.spec,1.47,1.48
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/avidemux/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3094
Modified Files:
avidemux.spec
Log Message:
* Sat Jun 04 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.4-9
- New version of js in Fedora 15 breaks build.
- Re-enable built-in javascript for Fedora 15.
Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/devel/avidemux.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- avidemux.spec 27 May 2011 14:35:24 -0000 1.47
+++ avidemux.spec 4 Jun 2011 12:33:21 -0000 1.48
@@ -2,7 +2,7 @@
Name: avidemux
Version: 2.5.4
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: Graphical video editing and transcoding tool
Group: Applications/Multimedia
@@ -179,7 +179,7 @@
%setup -q -n avidemux_%{version}
# Remove unneeded external libraries
-rm -rf avidemux/ADM_libraries/ADM_smjs
+#rm -rf avidemux/ADM_libraries/ADM_smjs
rm -rf plugins/ADM_videoFilters/Ass/ADM_libAss
rm -rf plugins/ADM_audioEncoders/twolame/ADM_libtwolame
rm -rf plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad
@@ -192,6 +192,14 @@
sed -i.bak 's/startDir="lib";/startDir="lib64";/' avidemux/main.cpp
%endif
+# Fix build with version of js introduced in F15.
+#find avidemux/ADM_script -name '*.h' -exec \
+#sed -i -e '/#include "jsapi.h"/ i\
+##undef malloc \
+##undef calloc \
+##undef realloc \
+##undef free' {} \;
+
%patch0 -p1 -b .parallel
%patch1 -p1 -b .pulse
%patch2 -p1 -b .qt4
@@ -214,10 +222,7 @@
%build
# Cmake requires out of source build
mkdir -p build && pushd build
-%cmake -DAVIDEMUX_INSTALL_PREFIX=%{_prefix} \
- -DAVIDEMUX_SOURCE_DIR="%{_pkgbuilddir}" \
- -DAVIDEMUX_CORECONFIG_DIR="%{_pkgbuilddir}/build/config" \
- -DUSE_SYSTEM_SPIDERMONKEY:BOOL=ON \
+%cmake -DUSE_SYSTEM_SPIDERMONKEY:BOOL=OFF \
..
make %{?_smp_mflags}
# Create the temp link directory manually since otherwise it happens too early
@@ -315,6 +320,10 @@
%{_includedir}/ADM_coreConfig.h
%changelog
+* Sat Jun 04 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.4-9
+- New version of js in Fedora 15 breaks build.
+- Re-enable built-in javascript for Fedora 15.
+
* Wed May 26 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.4-8
- Use system libass (subtitles).
- Use system liba52 (ac3 decoding).
12 years, 10 months
rpms/wl-kmod/F-15 wl-kmod.spec,1.53,1.54
by Thorsten Leemhuis
Author: thl
Update of /cvs/nonfree/rpms/wl-kmod/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv5633
Modified Files:
wl-kmod.spec
Log Message:
* Sat Jun 04 2011 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.60.48.36-2.3
- rebuild for updated kernel
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-15/wl-kmod.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- wl-kmod.spec 28 May 2011 18:27:37 -0000 1.53
+++ wl-kmod.spec 4 Jun 2011 06:08:39 -0000 1.54
@@ -7,7 +7,7 @@
Name: wl-kmod
Version: 5.60.48.36
-Release: 2%{?dist}.2
+Release: 2%{?dist}.3
Summary: Kernel module for broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -88,6 +88,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Jun 04 2011 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.60.48.36-2.3
+- rebuild for updated kernel
+
* Sat May 28 2011 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.60.48.36-2.2
- rebuild for updated kernel
12 years, 10 months