rpms/avidemux/F-14 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 avidemux.spec, 1.42, 1.43
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/avidemux/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv13418
Modified Files:
avidemux.spec
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:
* 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.
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)
Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/F-14/avidemux.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- avidemux.spec 24 Apr 2011 15:21:46 -0000 1.42
+++ avidemux.spec 27 May 2011 15:31:19 -0000 1.43
@@ -2,7 +2,7 @@
Name: avidemux
Version: 2.5.4
-Release: 6%{?dist}
+Release: 8%{?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
@@ -191,14 +202,18 @@
%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 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" \
@@ -209,13 +224,15 @@
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 +240,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,6 +315,12 @@
%{_includedir}/ADM_coreConfig.h
%changelog
+* 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.
- Really fix x264 this time.
12 years, 12 months
rpms/avidemux/devel 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 avidemux.spec, 1.46, 1.47
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/avidemux/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8902
Modified Files:
avidemux.spec
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:
* 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.
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)
Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/devel/avidemux.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- avidemux.spec 16 May 2011 02:38:22 -0000 1.46
+++ avidemux.spec 27 May 2011 14:35:24 -0000 1.47
@@ -2,7 +2,7 @@
Name: avidemux
Version: 2.5.4
-Release: 7%{?dist}
+Release: 8%{?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
@@ -191,14 +202,18 @@
%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 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" \
@@ -209,13 +224,15 @@
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 +240,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,8 +315,11 @@
%{_includedir}/ADM_coreConfig.h
%changelog
-* Sun May 15 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.4-7
-- Rebuild for updated js (spidermonkey)
+* 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, 12 months
rpms/staging-kmod-addons/F-15 sources, 1.3, 1.4 .cvsignore, 1.3, 1.4 staging-kmod-addons.spec, 1.3, 1.4
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/staging-kmod-addons/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30100
Modified Files:
sources .cvsignore staging-kmod-addons.spec
Log Message:
Update to current kernels
Index: sources
===================================================================
RCS file: /cvs/free/rpms/staging-kmod-addons/F-15/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 2 Dec 2009 20:55:48 -0000 1.3
+++ sources 26 May 2011 12:52:41 -0000 1.4
@@ -1 +1 @@
-6715d98bbef8b2435af028e23cef7029 linux-staging-2.6.32-rc8.tar.bz2
+f5a1d18578d0931dd21d2be6f969ecda linux-staging-2.6.38.7.tar.bz2
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/staging-kmod-addons/F-15/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 2 Dec 2009 20:55:48 -0000 1.3
+++ .cvsignore 26 May 2011 12:52:41 -0000 1.4
@@ -1 +1 @@
-linux-staging-2.6.32-rc8.tar.bz2
+linux-staging-2.6.38.7.tar.bz2
Index: staging-kmod-addons.spec
===================================================================
RCS file: /cvs/free/rpms/staging-kmod-addons/F-15/staging-kmod-addons.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- staging-kmod-addons.spec 2 Dec 2009 20:55:48 -0000 1.3
+++ staging-kmod-addons.spec 26 May 2011 12:52:41 -0000 1.4
@@ -1,11 +1,11 @@
# drivers that we ship; to be synced with staging-kmod.spec
-%global stgdrvs ASUS_OLED EPL ET131X FB_UDL HECI HYPERV LINE6_USB RT2860 RT2870 RT3070 RT3090 RTL8187SE RTL8192SU RTL8192E SLICOSS W35UND PRISM2_USB VIDEO_GO7007 VT6655 VT6656
+%global stgdrvs ASUS_OLED BATMAN_ADV ECHO EPL ET131X FB_UDL FB_XGI HECI HYPERV IDE_PHISON LINE6_USB RT2860 RT2870 RT3070 RT3090 RAMZSWAP R8187SE RTL8192SU RTL8192E RTL8192U SAMSUNG_LAPTOP SLICOSS W35UND PRISM2_USB VIDEO_GO7007 VT6655 VT6656
# makes handling for rc kernels a whole lot easier:
-%global prever rc8
+#global prever rc8
Name: staging-kmod-addons
-Version: 2.6.32
+Version: 2.6.38.7
Release: %{?prever:0.}1%{?prever:.%{prever}}%{?dist}
Summary: Documentation and shared parts for the kmod-staging packages
@@ -58,6 +58,29 @@
%changelog
+* Tue May 24 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 2.6.38.7-1
+- Update to 2.6.38.7
+
+* Thu Jan 06 2011 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.35.10-1
+- update to 2.6.35.10
+
+* Sat Oct 30 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.35.6-1
+- update to 2.6.35.6 for F14
+- enable FB_XGI
+
+* Sun Aug 08 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.34.2-1.1
+- update to 2.6.34.2, which is hitting updates-testing for F13
+- enable phison (#1338)
+
+* Sun Apr 25 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.33.2-2
+- enable echo
+
+* Fri Apr 16 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.33.2-1
+- update to 2.6.33.2 for F13
+
+* Sat Feb 20 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.32.8-1
+- update to 2.6.32.8 for updates-testing kernel
+
* Sun Dec 02 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.32-0.1.rc1
- enable HYPERV, RT3090, RTL8192E, VT6656
- drop AGNX, dropped upstream
12 years, 12 months
rpms/staging-kmod/F-15 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 staging-kmod.spec, 1.13, 1.14
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/staging-kmod/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29730
Modified Files:
.cvsignore sources staging-kmod.spec
Log Message:
Update to current kernel
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/staging-kmod/F-15/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 2 Dec 2009 20:54:51 -0000 1.3
+++ .cvsignore 26 May 2011 12:51:37 -0000 1.4
@@ -1 +1 @@
-linux-staging-2.6.32-rc8.tar.bz2
+linux-staging-2.6.38.7.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/staging-kmod/F-15/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 2 Dec 2009 20:54:51 -0000 1.3
+++ sources 26 May 2011 12:51:37 -0000 1.4
@@ -1 +1 @@
-6715d98bbef8b2435af028e23cef7029 linux-staging-2.6.32-rc8.tar.bz2
+f5a1d18578d0931dd21d2be6f969ecda linux-staging-2.6.38.7.tar.bz2
Index: staging-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/staging-kmod/F-15/staging-kmod.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- staging-kmod.spec 2 Dec 2009 20:54:51 -0000 1.13
+++ staging-kmod.spec 26 May 2011 12:51:37 -0000 1.14
@@ -6,14 +6,23 @@
%define buildforkernels newest
# which drivers to built
-%global stgdrvs ASUS_OLED EPL ET131X FB_UDL HECI HYPERV LINE6_USB RT2860 RT2870 RT3070 RT3090 RTL8187SE RTL8192SU RTL8192E SLICOSS W35UND PRISM2_USB VIDEO_GO7007 VT6655 VT6656
-# todo: VIDEO_CX25821
+%global stgdrvs ASUS_OLED BATMAN_ADV ECHO EPL ET131X FB_UDL FB_XGI HECI HYPERV IDE_PHISON LINE6_USB RT2860 RT2870 RT3070 RT3090 RAMZSWAP R8187SE RTL8192SU RTL8192E RTL8192U SAMSUNG_LAPTOP SLICOSS W35UND PRISM2_USB VT6655 VT6656
+
+# avoid this error:
+# /usr/lib/rpm/debugedit: canonicalization unexpectedly shrank by one character
+%define debug_package %{nil}
+
+# todo:
+# VIDEO_CX25821 cx25821/
+# VIDEO_TM6000 tm6000/
+# VIDEO_DT3155 dt3155v4l/
+# CXT1E1 cxt1e1/
# makes handling for rc kernels a whole lot easier:
-%global prever rc8
+#global prever rc8
Name: staging-kmod
-Version: 2.6.32
+Version: 2.6.38.7
Release: %{?prever:0.}1%{?prever:.%{prever}}%{?dist}
Summary: Selected kernel modules from linux-staging
@@ -43,8 +52,8 @@
# prepare
%setup -q -c -T -a 0
-# disable drivers that are enabled in Fedora's kernel, as those otherweise will get build
-sed -i 's|.*at76.*||' linux-staging-%{version}%{?prever:-%{prever}}/drivers/staging/Makefile
+# disable drivers that are enabled in Fedora's kernel, as those otherweise would get build
+sed -i 's|.*at76.*||; s|.*WAVELAN.*||; s|.*PCMCIA_NETWAVE.*|| ; s|.CRYSTALH||' linux-staging-%{version}%{?prever:-%{prever}}/drivers/staging/Makefile
# seperate directories for each kernel variant (PAE, non-PAE, ...) we build the modules for
for kernel_version in %{?kernel_versions} ; do
@@ -57,13 +66,20 @@
for module in %{stgdrvs} ; do
configops="CONFIG_${module}=m"
case "${module}" in
- VIDEO_HYPERV)
+ CX25821)
+ configops="${configops} CONFIG_CX25821_ALSA"
+ ;;
+ HYPERV)
+ ( [[ "%{_target_cpu}" == "ppc" ]] || [[ "%{_target_cpu}" == "ppc64" ]] ) && continue
configops="${configops} CONFIG_${module}_STORAGE=m CONFIG_${module}_BLOCK=m CONFIG_${module}_NET=m"
;;
PRISM2_USB)
# does not build on ppc and ppc64 as of 011109; tested with 2.6.31.5
( [[ "%{_target_cpu}" == "ppc" ]] || [[ "%{_target_cpu}" == "ppc64" ]] ) && continue
;;
+ RAMZSWAP)
+ configops="${configops} CONFIG_RAMZSWAP_STATS=y"
+ ;;
RT3090)
configops="${configops} -I ${PWD}/_kmod_build_${kernel_version%%___*}/"
;;
@@ -103,8 +119,81 @@
%clean
rm -rf $RPM_BUILD_ROOT
-
%changelog
+* Tue May 24 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 2.6.36.7-1
+- Update to 2.6.38.7
+
+* Thu May 05 2011 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.35.10-1.4
+- rebuild for updated kernel
+
+* Sun Apr 24 2011 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.35.10-1.3
+- rebuild for updated kernel
+
+* Mon Apr 04 2011 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.35.10-1.2
+- rebuild for updated kernel
+
+* Sat Feb 12 2011 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.35.10-1.1
+- rebuild for updated kernel
+
+* Sat Dec 25 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.35.10-1
+- update to 2.6.35.10
+- disable VIDEO_GO7007, broken upstream
+
+* Fri Dec 24 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.35.6-1.6
+- rebuild for updated kernel
+
+* Wed Dec 22 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.35.6-1.5
+- rebuild for updated kernel
+
+* Mon Dec 20 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.35.6-1.4
+- rebuild for updated kernel
+
+* Fri Dec 17 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.35.6-1.3
+- rebuild for updated kernel
+
+* Sun Dec 05 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.35.6-1.2
+- rebuild for F-14 kernel
+
+* Mon Nov 01 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.35.6-1.1
+- rebuild for F-14 kernel
+
+* Sat Oct 30 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.35.6-1
+- update to 2.6.35.6 for F14
+- enable FB_XGI
+- disable debuginfo generation to avoid a build problem
+
+* Thu Oct 21 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.34.2-1.7
+- rebuild for new kernel
+
+* Sun Sep 19 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.34.2-1.6
+- rebuild for new kernel
+
+* Sat Sep 11 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.34.2-1.5
+- rebuild for new kernel
+
+* Fri Sep 10 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.34.2-1.4
+- rebuild for new kernel
+
+* Sun Aug 29 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.34.2-1.3
+- rebuild for new kernel
+
+* Wed Aug 11 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.34.2-1.2
+- rebuild for new kernel
+
+* Sun Aug 08 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.34.2-1.1
+- update to 2.6.34.2, which is hitting updates-testing for F13
+- enable phison (#1338)
+
+* Fri Apr 10 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.33.2-1
+- update to 2.6.33.2
+- enable RAMZSWAP R8187SE RTL8192U BATMAN_ADV SAMSUNG_LAPTOP
+- disable RTL8187SE (renamed)
+- disable WAVELAN.* and PCMCIA_NETWAVE, as they are enabled in Fedora
+
+* Sat Feb 20 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.32.8-1
+- update to 2.6.32.8 for updates-testing kernel
+- disable hv on ppc as it's useless and does not build
+
* Sun Dec 02 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.32-0.1.rc1
- enable HYPERV, RT3090, RTL8192E, VT6656
- drop AGNX, dropped upstream
12 years, 12 months
rpms/staging-kmod/devel staging-kmod.spec,1.14,1.15
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/staging-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29469
Modified Files:
staging-kmod.spec
Log Message:
Rebuilt for newest
Index: staging-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/staging-kmod/devel/staging-kmod.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- staging-kmod.spec 26 May 2011 12:29:26 -0000 1.14
+++ staging-kmod.spec 26 May 2011 12:49:26 -0000 1.15
@@ -3,7 +3,7 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-#define buildforkernels newest
+%define buildforkernels newest
# which drivers to built
%global stgdrvs ASUS_OLED BATMAN_ADV ECHO EPL ET131X FB_UDL FB_XGI HECI HYPERV IDE_PHISON LINE6_USB RT2860 RT2870 RT3070 RT3090 RAMZSWAP R8187SE RTL8192SU RTL8192E RTL8192U SAMSUNG_LAPTOP SLICOSS W35UND PRISM2_USB VT6655 VT6656
12 years, 12 months
rpms/staging-kmod-addons/devel staging-kmod-addons.spec,1.4,1.5
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/staging-kmod-addons/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27943
Modified Files:
staging-kmod-addons.spec
Log Message:
Fix typo in kver
Index: staging-kmod-addons.spec
===================================================================
RCS file: /cvs/free/rpms/staging-kmod-addons/devel/staging-kmod-addons.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- staging-kmod-addons.spec 26 May 2011 12:26:09 -0000 1.4
+++ staging-kmod-addons.spec 26 May 2011 12:31:31 -0000 1.5
@@ -5,7 +5,7 @@
#global prever rc8
Name: staging-kmod-addons
-Version: 2.6.36.7
+Version: 2.6.38.7
Release: %{?prever:0.}1%{?prever:.%{prever}}%{?dist}
Summary: Documentation and shared parts for the kmod-staging packages
@@ -58,7 +58,7 @@
%changelog
-* Tue May 24 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 2.6.36.7-1
+* Tue May 24 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 2.6.38.7-1
- Update to 2.6.38.7
* Thu Jan 06 2011 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.35.10-1
12 years, 12 months
rpms/staging-kmod/devel sources, 1.3, 1.4 .cvsignore, 1.3, 1.4 staging-kmod.spec, 1.13, 1.14
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/staging-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27821
Modified Files:
sources .cvsignore staging-kmod.spec
Log Message:
Update to current kernel
Index: sources
===================================================================
RCS file: /cvs/free/rpms/staging-kmod/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 2 Dec 2009 20:54:51 -0000 1.3
+++ sources 26 May 2011 12:29:26 -0000 1.4
@@ -1 +1 @@
-6715d98bbef8b2435af028e23cef7029 linux-staging-2.6.32-rc8.tar.bz2
+f5a1d18578d0931dd21d2be6f969ecda linux-staging-2.6.38.7.tar.bz2
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/staging-kmod/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 2 Dec 2009 20:54:51 -0000 1.3
+++ .cvsignore 26 May 2011 12:29:26 -0000 1.4
@@ -1 +1 @@
-linux-staging-2.6.32-rc8.tar.bz2
+linux-staging-2.6.38.7.tar.bz2
Index: staging-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/staging-kmod/devel/staging-kmod.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- staging-kmod.spec 2 Dec 2009 20:54:51 -0000 1.13
+++ staging-kmod.spec 26 May 2011 12:29:26 -0000 1.14
@@ -3,17 +3,26 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%define buildforkernels newest
+#define buildforkernels newest
# which drivers to built
-%global stgdrvs ASUS_OLED EPL ET131X FB_UDL HECI HYPERV LINE6_USB RT2860 RT2870 RT3070 RT3090 RTL8187SE RTL8192SU RTL8192E SLICOSS W35UND PRISM2_USB VIDEO_GO7007 VT6655 VT6656
-# todo: VIDEO_CX25821
+%global stgdrvs ASUS_OLED BATMAN_ADV ECHO EPL ET131X FB_UDL FB_XGI HECI HYPERV IDE_PHISON LINE6_USB RT2860 RT2870 RT3070 RT3090 RAMZSWAP R8187SE RTL8192SU RTL8192E RTL8192U SAMSUNG_LAPTOP SLICOSS W35UND PRISM2_USB VT6655 VT6656
+
+# avoid this error:
+# /usr/lib/rpm/debugedit: canonicalization unexpectedly shrank by one character
+%define debug_package %{nil}
+
+# todo:
+# VIDEO_CX25821 cx25821/
+# VIDEO_TM6000 tm6000/
+# VIDEO_DT3155 dt3155v4l/
+# CXT1E1 cxt1e1/
# makes handling for rc kernels a whole lot easier:
-%global prever rc8
+#global prever rc8
Name: staging-kmod
-Version: 2.6.32
+Version: 2.6.38.7
Release: %{?prever:0.}1%{?prever:.%{prever}}%{?dist}
Summary: Selected kernel modules from linux-staging
@@ -43,8 +52,8 @@
# prepare
%setup -q -c -T -a 0
-# disable drivers that are enabled in Fedora's kernel, as those otherweise will get build
-sed -i 's|.*at76.*||' linux-staging-%{version}%{?prever:-%{prever}}/drivers/staging/Makefile
+# disable drivers that are enabled in Fedora's kernel, as those otherweise would get build
+sed -i 's|.*at76.*||; s|.*WAVELAN.*||; s|.*PCMCIA_NETWAVE.*|| ; s|.CRYSTALH||' linux-staging-%{version}%{?prever:-%{prever}}/drivers/staging/Makefile
# seperate directories for each kernel variant (PAE, non-PAE, ...) we build the modules for
for kernel_version in %{?kernel_versions} ; do
@@ -57,13 +66,20 @@
for module in %{stgdrvs} ; do
configops="CONFIG_${module}=m"
case "${module}" in
- VIDEO_HYPERV)
+ CX25821)
+ configops="${configops} CONFIG_CX25821_ALSA"
+ ;;
+ HYPERV)
+ ( [[ "%{_target_cpu}" == "ppc" ]] || [[ "%{_target_cpu}" == "ppc64" ]] ) && continue
configops="${configops} CONFIG_${module}_STORAGE=m CONFIG_${module}_BLOCK=m CONFIG_${module}_NET=m"
;;
PRISM2_USB)
# does not build on ppc and ppc64 as of 011109; tested with 2.6.31.5
( [[ "%{_target_cpu}" == "ppc" ]] || [[ "%{_target_cpu}" == "ppc64" ]] ) && continue
;;
+ RAMZSWAP)
+ configops="${configops} CONFIG_RAMZSWAP_STATS=y"
+ ;;
RT3090)
configops="${configops} -I ${PWD}/_kmod_build_${kernel_version%%___*}/"
;;
@@ -103,8 +119,81 @@
%clean
rm -rf $RPM_BUILD_ROOT
-
%changelog
+* Tue May 24 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 2.6.36.7-1
+- Update to 2.6.38.7
+
+* Thu May 05 2011 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.35.10-1.4
+- rebuild for updated kernel
+
+* Sun Apr 24 2011 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.35.10-1.3
+- rebuild for updated kernel
+
+* Mon Apr 04 2011 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.35.10-1.2
+- rebuild for updated kernel
+
+* Sat Feb 12 2011 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.35.10-1.1
+- rebuild for updated kernel
+
+* Sat Dec 25 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.35.10-1
+- update to 2.6.35.10
+- disable VIDEO_GO7007, broken upstream
+
+* Fri Dec 24 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.35.6-1.6
+- rebuild for updated kernel
+
+* Wed Dec 22 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.35.6-1.5
+- rebuild for updated kernel
+
+* Mon Dec 20 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.35.6-1.4
+- rebuild for updated kernel
+
+* Fri Dec 17 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.35.6-1.3
+- rebuild for updated kernel
+
+* Sun Dec 05 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.35.6-1.2
+- rebuild for F-14 kernel
+
+* Mon Nov 01 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.35.6-1.1
+- rebuild for F-14 kernel
+
+* Sat Oct 30 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.35.6-1
+- update to 2.6.35.6 for F14
+- enable FB_XGI
+- disable debuginfo generation to avoid a build problem
+
+* Thu Oct 21 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.34.2-1.7
+- rebuild for new kernel
+
+* Sun Sep 19 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.34.2-1.6
+- rebuild for new kernel
+
+* Sat Sep 11 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.34.2-1.5
+- rebuild for new kernel
+
+* Fri Sep 10 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.34.2-1.4
+- rebuild for new kernel
+
+* Sun Aug 29 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.34.2-1.3
+- rebuild for new kernel
+
+* Wed Aug 11 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.34.2-1.2
+- rebuild for new kernel
+
+* Sun Aug 08 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.34.2-1.1
+- update to 2.6.34.2, which is hitting updates-testing for F13
+- enable phison (#1338)
+
+* Fri Apr 10 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.33.2-1
+- update to 2.6.33.2
+- enable RAMZSWAP R8187SE RTL8192U BATMAN_ADV SAMSUNG_LAPTOP
+- disable RTL8187SE (renamed)
+- disable WAVELAN.* and PCMCIA_NETWAVE, as they are enabled in Fedora
+
+* Sat Feb 20 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.32.8-1
+- update to 2.6.32.8 for updates-testing kernel
+- disable hv on ppc as it's useless and does not build
+
* Sun Dec 02 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.32-0.1.rc1
- enable HYPERV, RT3090, RTL8192E, VT6656
- drop AGNX, dropped upstream
12 years, 12 months
rpms/staging-kmod-addons/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 staging-kmod-addons.spec, 1.3, 1.4
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/staging-kmod-addons/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27089
Modified Files:
.cvsignore sources staging-kmod-addons.spec
Log Message:
Update to current kernel
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/staging-kmod-addons/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 2 Dec 2009 20:55:48 -0000 1.3
+++ .cvsignore 26 May 2011 12:26:09 -0000 1.4
@@ -1 +1 @@
-linux-staging-2.6.32-rc8.tar.bz2
+linux-staging-2.6.38.7.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/staging-kmod-addons/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 2 Dec 2009 20:55:48 -0000 1.3
+++ sources 26 May 2011 12:26:09 -0000 1.4
@@ -1 +1 @@
-6715d98bbef8b2435af028e23cef7029 linux-staging-2.6.32-rc8.tar.bz2
+f5a1d18578d0931dd21d2be6f969ecda linux-staging-2.6.38.7.tar.bz2
Index: staging-kmod-addons.spec
===================================================================
RCS file: /cvs/free/rpms/staging-kmod-addons/devel/staging-kmod-addons.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- staging-kmod-addons.spec 2 Dec 2009 20:55:48 -0000 1.3
+++ staging-kmod-addons.spec 26 May 2011 12:26:09 -0000 1.4
@@ -1,11 +1,11 @@
# drivers that we ship; to be synced with staging-kmod.spec
-%global stgdrvs ASUS_OLED EPL ET131X FB_UDL HECI HYPERV LINE6_USB RT2860 RT2870 RT3070 RT3090 RTL8187SE RTL8192SU RTL8192E SLICOSS W35UND PRISM2_USB VIDEO_GO7007 VT6655 VT6656
+%global stgdrvs ASUS_OLED BATMAN_ADV ECHO EPL ET131X FB_UDL FB_XGI HECI HYPERV IDE_PHISON LINE6_USB RT2860 RT2870 RT3070 RT3090 RAMZSWAP R8187SE RTL8192SU RTL8192E RTL8192U SAMSUNG_LAPTOP SLICOSS W35UND PRISM2_USB VIDEO_GO7007 VT6655 VT6656
# makes handling for rc kernels a whole lot easier:
-%global prever rc8
+#global prever rc8
Name: staging-kmod-addons
-Version: 2.6.32
+Version: 2.6.36.7
Release: %{?prever:0.}1%{?prever:.%{prever}}%{?dist}
Summary: Documentation and shared parts for the kmod-staging packages
@@ -58,6 +58,29 @@
%changelog
+* Tue May 24 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 2.6.36.7-1
+- Update to 2.6.38.7
+
+* Thu Jan 06 2011 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.35.10-1
+- update to 2.6.35.10
+
+* Sat Oct 30 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.35.6-1
+- update to 2.6.35.6 for F14
+- enable FB_XGI
+
+* Sun Aug 08 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.34.2-1.1
+- update to 2.6.34.2, which is hitting updates-testing for F13
+- enable phison (#1338)
+
+* Sun Apr 25 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.33.2-2
+- enable echo
+
+* Fri Apr 16 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.33.2-1
+- update to 2.6.33.2 for F13
+
+* Sat Feb 20 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.32.8-1
+- update to 2.6.32.8 for updates-testing kernel
+
* Sun Dec 02 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.32-0.1.rc1
- enable HYPERV, RT3090, RTL8192E, VT6656
- drop AGNX, dropped upstream
12 years, 12 months
rpms/ndiswrapper-kmod/devel ndiswrapper-kmod.spec,1.42,1.43
by Tristan Moody
Author: swglasspit
Update of /cvs/free/rpms/ndiswrapper-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv11458
Modified Files:
ndiswrapper-kmod.spec
Log Message:
updated version number missed in last commit
Index: ndiswrapper-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/ndiswrapper-kmod/devel/ndiswrapper-kmod.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- ndiswrapper-kmod.spec 26 May 2011 09:17:22 -0000 1.42
+++ ndiswrapper-kmod.spec 26 May 2011 09:20:09 -0000 1.43
@@ -8,7 +8,7 @@
Summary: Ndiswrapper kernel module
Name: ndiswrapper-kmod
Version: 1.56
-Release: 1%{?dist}.1
+Release: 1%{?dist}.2
License: GPLv2
Group: System Environment/Kernel
URL: http://ndiswrapper.sourceforge.net
12 years, 12 months
rpms/ndiswrapper-kmod/devel ndiswrapper-1.56-redundant-define.patch, NONE, 1.1 ndiswrapper-kmod.spec, 1.41, 1.42
by Tristan Moody
Author: swglasspit
Update of /cvs/free/rpms/ndiswrapper-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv11339
Modified Files:
ndiswrapper-kmod.spec
Added Files:
ndiswrapper-1.56-redundant-define.patch
Log Message:
* Thu May 26 2011 Tristan Moody <tmoody [AT] ku [DOT] edu> - 1.56-1.1
- remove redundant defines that break build on new F-15 kernel
ndiswrapper-1.56-redundant-define.patch:
pe_linker.h | 2 +-
winnt_types.h | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
--- NEW FILE ndiswrapper-1.56-redundant-define.patch ---
--- ndiswrapper-1.56/driver/winnt_types.h 2010-02-10 20:09:32.000000000 -0600
+++ ndiswrapper-1.56/driver/winnt_types.h 2011-05-26 03:36:46.496398169 -0500
@@ -138,7 +138,6 @@
#endif
-#define packed __attribute__((packed))
#define no_warn_unused __attribute__((unused))
typedef u8 BOOLEAN;
--- ndiswrapper-1.56/driver/pe_linker.h 2010-02-10 20:09:32.000000000 -0600
+++ ndiswrapper-1.56/driver/pe_linker.h 2011-05-26 03:36:57.348262500 -0500
@@ -691,7 +691,7 @@
/* Import module directory */
-typedef struct packed _IMAGE_IMPORT_DESCRIPTOR {
+typedef struct __packed _IMAGE_IMPORT_DESCRIPTOR {
union {
DWORD Characteristics; /* 0 for terminating null
* import descriptor */
Index: ndiswrapper-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/ndiswrapper-kmod/devel/ndiswrapper-kmod.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- ndiswrapper-kmod.spec 13 Feb 2011 20:58:55 -0000 1.41
+++ ndiswrapper-kmod.spec 26 May 2011 09:17:22 -0000 1.42
@@ -23,6 +23,7 @@
Patch6: ndiswrapper-1.56-kernel-2.6.35-api-update-1.patch
Patch7: ndiswrapper-1.56-kernel-2.6.35-api-update-2.patch
Patch8: ndiswrapper-1.56-kernel-2.6.35-api-update-3.patch
+Patch9: ndiswrapper-1.56-redundant-define.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# needed for plague to make sure it builds for i586 and i686
@@ -62,6 +63,7 @@
%patch6 -p1 -b .kernel-2.6.35-api-update-1
%patch7 -p1 -b .kernel-2.6.35-api-update-2
%patch8 -p1 -b .kernel-2.6.35-api-update-3
+%patch9 -p1 -b .redundant-define
#%patch0 -p2 -b .we_update
#%patch1 -p1 -b .poll_controller
)
@@ -91,8 +93,8 @@
%changelog
-* Wed Dec 01 2010 Tristan Moody <tmoody [AT] ku [DOT] edu> - 1.56-1
-- update for new kernel-2.6.35 api that breaks 1.54 build
+* Thu May 26 2011 Tristan Moody <tmoody [AT] ku [DOT] edu> - 1.56-1.1
+- remove redundant defines that break build on new F-15 kernel
* Sun Nov 22 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.54-4.15
- rebuild for new kernel, disable i586 builds
12 years, 12 months