rpms/vboxgtk/F-11 vboxgtk.spec,1.1,1.2
by Hicham HAOUARI
Author: hicham
Update of /cvs/free/rpms/vboxgtk/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29285/F-11
Modified Files:
vboxgtk.spec
Log Message:
Index: vboxgtk.spec
===================================================================
RCS file: /cvs/free/rpms/vboxgtk/F-11/vboxgtk.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vboxgtk.spec 12 Aug 2009 13:24:01 -0000 1.1
+++ vboxgtk.spec 15 Aug 2009 17:55:05 -0000 1.2
@@ -1,8 +1,9 @@
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%global debug_package %{nil}
Name: vboxgtk
Version: 0.5.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A simple GTK frontend for VirtualBox
Group: Applications/Emulators
@@ -16,13 +17,14 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if 0%{?fedora} > 11
-ExclusiveArch: i686 x86_64
+ExclusiveArch: i686 x86_64
%else %if 0%{?fedora} > 10
-ExclusiveArch: i586 x86_64
+ExclusiveArch: i586 x86_64
%else
-ExclusiveArch: i386 x86_64
+ExclusiveArch: i386 x86_64
%endif
+BuildRequires: python-devel intltool gettext
Requires: python-VirtualBox-OSE
%description
@@ -38,7 +40,7 @@
%install
rm -rf $RPM_BUILD_ROOT
-./setup.py install --root $RPM_BUILD_ROOT
+python setup.py install --root $RPM_BUILD_ROOT --install-lib=%{python_sitelib}
%find_lang %{name}
%clean
@@ -60,6 +62,9 @@
%{_datadir}/%{name}
%changelog
+* Sat Aug 15 2009 Hicham HAOUARI <hicham.haouari(a)gmail.com> 0.5.0-3
+- Fixed BR after a failed build.
+
* Sun Aug 09 2009 Hicham HAOUARI <hicham.haouari(a)gmail.com> 0.5.0-2
- Spec cleanup (https://bugzilla.rpmfusion.org/show_bug.cgi?id=751#c2).
* Fri Aug 07 2009 Hicham HAOUARI <hicham.haouari(a)gmail.com> 0.5.0-1
15 years, 3 months
rpms/vboxgtk/devel vboxgtk.spec,1.1,1.2
by Hicham HAOUARI
Author: hicham
Update of /cvs/free/rpms/vboxgtk/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv28806/devel
Modified Files:
vboxgtk.spec
Log Message:
Index: vboxgtk.spec
===================================================================
RCS file: /cvs/free/rpms/vboxgtk/devel/vboxgtk.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vboxgtk.spec 12 Aug 2009 13:11:00 -0000 1.1
+++ vboxgtk.spec 15 Aug 2009 17:52:03 -0000 1.2
@@ -1,8 +1,9 @@
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%global debug_package %{nil}
Name: vboxgtk
Version: 0.5.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A simple GTK frontend for VirtualBox
Group: Applications/Emulators
@@ -16,13 +17,14 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if 0%{?fedora} > 11
-ExclusiveArch: i686 x86_64
+ExclusiveArch: i686 x86_64
%else %if 0%{?fedora} > 10
-ExclusiveArch: i586 x86_64
+ExclusiveArch: i586 x86_64
%else
-ExclusiveArch: i386 x86_64
+ExclusiveArch: i386 x86_64
%endif
+BuildRequires: python-devel intltool gettext
Requires: python-VirtualBox-OSE
%description
@@ -38,7 +40,7 @@
%install
rm -rf $RPM_BUILD_ROOT
-./setup.py install --root $RPM_BUILD_ROOT
+python setup.py install --root $RPM_BUILD_ROOT --install-lib=%{python_sitelib}
%find_lang %{name}
%clean
@@ -60,6 +62,9 @@
%{_datadir}/%{name}
%changelog
+* Sat Aug 15 2009 Hicham HAOUARI <hicham.haouari(a)gmail.com> 0.5.0-3
+- Fixed BR after a failed build.
+
* Sun Aug 09 2009 Hicham HAOUARI <hicham.haouari(a)gmail.com> 0.5.0-2
- Spec cleanup (https://bugzilla.rpmfusion.org/show_bug.cgi?id=751#c2).
* Fri Aug 07 2009 Hicham HAOUARI <hicham.haouari(a)gmail.com> 0.5.0-1
15 years, 3 months
rpms/VirtualBox-OSE-kmod/devel VirtualBox-OSE-kmod.spec,1.19,1.20
by Lubomir Rintel
Author: lkundrak
Update of /cvs/free/rpms/VirtualBox-OSE-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25602
Modified Files:
VirtualBox-OSE-kmod.spec
Log Message:
* Sat Aug 15 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.4-2
- Make it possible to disable hardening, do so by default
Index: VirtualBox-OSE-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE-kmod/devel/VirtualBox-OSE-kmod.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- VirtualBox-OSE-kmod.spec 9 Aug 2009 14:25:29 -0000 1.19
+++ VirtualBox-OSE-kmod.spec 15 Aug 2009 17:00:57 -0000 1.20
@@ -5,9 +5,12 @@
# a new akmod package will only get build when a new one is actually needed
#define buildforkernels newest
+# Allow only root to access vboxdrv regardless of the file mode
+%bcond_with hardening
+
Name: VirtualBox-OSE-kmod
Version: 3.0.4
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Kernel module for VirtualBox-OSE
Group: System Environment/Kernel
@@ -47,6 +50,9 @@
# print kmodtool output for debugging purposes:
kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} --filterfile %{SOURCE1} 2>/dev/null
+# This is hardcoded in Makefiles
+# Kto zisti, preco tu nefunguje %%without hardening ma u mna nanuk
+%{?with_hardening:find %{name}-%{version} -name Makefile |xargs sed 's/-DVBOX_WITH_HARDENING//' -i}
for kernel_version in %{?kernel_versions} ; do
cp -al %{name}-%{version} _kmod_build_${kernel_version%%___*}
@@ -85,6 +91,9 @@
%changelog
+* Sat Aug 15 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.4-2
+- Make it possible to disable hardening, do so by default
+
* Sun Aug 09 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.4-1
- New release
- Check that we build all modules present
15 years, 3 months
rpms/VirtualBox-OSE/devel VirtualBox-OSE.spec,1.20,1.21
by Lubomir Rintel
Author: lkundrak
Update of /cvs/free/rpms/VirtualBox-OSE/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25156
Modified Files:
VirtualBox-OSE.spec
Log Message:
Get rid of SUID! All hail file capabilities!
Index: VirtualBox-OSE.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/VirtualBox-OSE.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- VirtualBox-OSE.spec 9 Aug 2009 17:57:32 -0000 1.20
+++ VirtualBox-OSE.spec 15 Aug 2009 16:57:39 -0000 1.21
@@ -8,11 +8,17 @@
# Lots of useless checks
# This will be enabled by default once RPM is built with caps enabled
-%bcond_without hardening
+%bcond_with hardening
+
+%if %with hardening
+%define priv_mode %%attr(4755,root,root)
+%else
+%define priv_mode %%caps(cap_net_raw+ep)
+%endif
Name: VirtualBox-OSE
Version: 3.0.4
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
Group: Development/Tools
@@ -50,6 +56,7 @@
BuildRequires: desktop-file-utils
BuildRequires: libcap-devel
BuildRequires: qt4-devel
+BuildRequires: gsoap-devel
# For the X11 module
BuildRequires: libdrm-devel
@@ -145,7 +152,7 @@
%build
./configure --disable-kmods --enable-webservice \
- %{?_without_hardening:--disable-hardening}
+ %{!?with_hardening:--disable-hardening}
. ./env.sh
@@ -203,16 +210,13 @@
obj/bin/V*.gc \
obj/bin/V*.r0
-# SetUID root binaries
-install -p -m 4755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \
+# Executabes
+install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \
obj/bin/VBoxHeadless \
obj/bin/VBoxSDL \
obj/bin/VBoxNetDHCP \
obj/bin/VBoxNetAdpCtl \
- obj/bin/VirtualBox
-
-# Other binaries
-install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \
+ obj/bin/VirtualBox \
obj/bin/VBoxManage \
obj/bin/VBoxSVC \
obj/bin/VBoxXPCOMIPCD \
@@ -363,7 +367,19 @@
%{_bindir}/VBoxSDL
%{_bindir}/VBoxTunctl
%{_bindir}/VirtualBox
-%{_libdir}/virtualbox
+%dir %{_libdir}/virtualbox
+%{_libdir}/virtualbox/*.*
+%{_libdir}/virtualbox/components
+%{_libdir}/virtualbox/nls
+%{_libdir}/virtualbox/VBoxManage
+%{_libdir}/virtualbox/VBoxSVC
+%{_libdir}/virtualbox/VBoxTestOGL
+%{_libdir}/virtualbox/VBoxXPCOMIPCD
+%{priv_mode} %{_libdir}/virtualbox/VBoxHeadless
+%{priv_mode} %{_libdir}/virtualbox/VBoxSDL
+%{priv_mode} %{_libdir}/virtualbox/VBoxNetDHCP
+%{priv_mode} %{_libdir}/virtualbox/VBoxNetAdpCtl
+%{priv_mode} %{_libdir}/virtualbox/VirtualBox
%{_datadir}/pixmaps/*
%{_datadir}/applications/*.desktop
%config %{_sysconfdir}/vbox/vbox.cfg
@@ -408,6 +424,10 @@
%changelog
+* Sat Aug 15 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.4-4
+- Exchange hardening for filesystem capabilities
+- Enable web services
+
* Sun Aug 08 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.4-3
- Include VBoxRandR
- Add dri module to guest
15 years, 3 months
rpms/avidemux/F-11 avidemux.spec,1.29,1.30
by Stewart Adam
Author: firewing
Update of /cvs/free/rpms/avidemux/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv23545
Modified Files:
avidemux.spec
Log Message:
* Sat Aug 15 2009 Stewart Adam <s.adam at diffingo.com> - 2.5.0-9.20090814svn
- Disable PPC* as it still fails to build even with new patches
Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/F-11/avidemux.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- avidemux.spec 15 Aug 2009 00:32:19 -0000 1.29
+++ avidemux.spec 15 Aug 2009 16:32:08 -0000 1.30
@@ -1,6 +1,6 @@
Name: avidemux
Version: 2.5.0
-Release: 8.20090814svn%{?dist}
+Release: 9.20090814svn%{?dist}
Summary: Graphical video editing and transcoding tool
Group: Applications/Multimedia
@@ -27,8 +27,8 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-## Upstream has been informed http://avidemux.org/admForum/viewtopic.php?id=6447
-#ExcludeArch: ppc ppc64
+# 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}
@@ -67,7 +67,6 @@
BuildRequires: libmad-devel >= 0.15.1
BuildRequires: libogg-devel >= 1.1
BuildRequires: libvorbis-devel >= 1.0.1
-
BuildRequires: libdca-devel
@@ -241,6 +240,9 @@
%{_includedir}/ADM_coreConfig.h
%changelog
+* Sat Aug 15 2009 Stewart Adam <s.adam at diffingo.com> - 2.5.0-9.20090814svn
+- Disable PPC* as it still fails to build even with new patches
+
* Fri Aug 14 2009 Stewart Adam <s.adam at diffingo.com> - 2.5.0-8.20090814svn
- Fix arguments for pulse patch (got mixed up with the 2.4 patch)
15 years, 3 months
rpms/avidemux/F-11 avidemux.spec,1.28,1.29
by Stewart Adam
Author: firewing
Update of /cvs/free/rpms/avidemux/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3234
Modified Files:
avidemux.spec
Log Message:
* Fri Aug 14 2009 Stewart Adam <s.adam at diffingo.com> - 2.5.0-8.20090814svn
- Fix arguments for pulse patch (got mixed up with the 2.4 patch)
Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/F-11/avidemux.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- avidemux.spec 15 Aug 2009 00:00:36 -0000 1.28
+++ avidemux.spec 15 Aug 2009 00:32:19 -0000 1.29
@@ -1,6 +1,6 @@
Name: avidemux
Version: 2.5.0
-Release: 7.20090814svn%{?dist}
+Release: 8.20090814svn%{?dist}
Summary: Graphical video editing and transcoding tool
Group: Applications/Multimedia
@@ -160,7 +160,7 @@
%patch1 -p1 -b .plugins
%patch2 -p1 -b .ciparallel
%patch3 -p1 -b .fakeinstdir
-%patch4 -b .pulse
+%patch4 -p1 -b .pulse
%patch5 -p1 -b .qt4
%patch6 -p1 -b .i18n
%patch7 -p1 -b .altivec
@@ -241,6 +241,9 @@
%{_includedir}/ADM_coreConfig.h
%changelog
+* Fri Aug 14 2009 Stewart Adam <s.adam at diffingo.com> - 2.5.0-8.20090814svn
+- Fix arguments for pulse patch (got mixed up with the 2.4 patch)
+
* Fri Aug 14 2009 Stewart Adam <s.adam at diffingo.com> - 2.5.0-7.20090814svn
- Update to 2.5.0 subversion r5245
- Apply additional patches from Gentoo ebuild
15 years, 3 months
rpms/avidemux/F-11 2.5.0-build-plugins.patch, NONE, 1.1 2.5.0-coreImage-parallel-build.patch, NONE, 1.1 2.5.0-fake-inst-dir.patch, NONE, 1.1 avidemux-2.5-checkfunction-includes.patch, NONE, 1.1 avidemux-2.5-multilib.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 avidemux.spec, 1.27, 1.28 sources, 1.5, 1.6 avidemux-2.4-pulseaudio-default.patch, 1.2, NONE avidemux-2.5-filelocations.patch, 1.1, NONE avidemux-2.5-gcc-44.patch, 1.1, NONE avidemux-plugins-2.5-gcc44.patch, 1.1, NONE avidemux-plugins-2.5-plugdir.patch, 1.1,
by Stewart Adam
Author: firewing
Update of /cvs/free/rpms/avidemux/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv1292
Modified Files:
.cvsignore avidemux.spec sources
Added Files:
2.5.0-build-plugins.patch 2.5.0-coreImage-parallel-build.patch
2.5.0-fake-inst-dir.patch
avidemux-2.5-checkfunction-includes.patch
avidemux-2.5-multilib.patch
Removed Files:
avidemux-2.4-pulseaudio-default.patch
avidemux-2.5-filelocations.patch avidemux-2.5-gcc-44.patch
avidemux-plugins-2.5-gcc44.patch
avidemux-plugins-2.5-plugdir.patch
Log Message:
* Fri Aug 14 2009 Stewart Adam <s.adam at diffingo.com> - 2.5.0-7.20090814svn
- Update to 2.5.0 subversion r5245
- Apply additional patches from Gentoo ebuild
- Re-enable PPC* builds as well as smp_mflags
2.5.0-build-plugins.patch:
--- NEW FILE 2.5.0-build-plugins.patch ---
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8bc1697..99e709e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -200,6 +200,7 @@ MESSAGE("")
ADD_SUBDIRECTORY(avidemux)
ADD_SUBDIRECTORY(po)
ADD_SUBDIRECTORY(scripts)
+ADD_SUBDIRECTORY(plugins EXCLUDE_FROM_ALL)
########################################
# Config Summary
diff --git a/cmake/ad_plugin.cmake b/cmake/ad_plugin.cmake
index 5070e18..3602026 100644
--- a/cmake/ad_plugin.cmake
+++ b/cmake/ad_plugin.cmake
@@ -6,9 +6,9 @@ ENDIF (WIN32)
MACRO(INIT_AUDIO_PLUGIN _lib)
INCLUDE_DIRECTORIES("${CMAKE_BINARY_DIR}/config")
- INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/../avidemux/ADM_core/include")
- INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/../avidemux/ADM_coreAudio/include")
- INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/../avidemux/ADM_audiocodec")
+ INCLUDE_DIRECTORIES("${AVIDEMUX_SOURCE_DIR}/avidemux/ADM_core/include")
+ INCLUDE_DIRECTORIES("${AVIDEMUX_SOURCE_DIR}/avidemux/ADM_coreAudio/include")
+ INCLUDE_DIRECTORIES("${AVIDEMUX_SOURCE_DIR}/avidemux/ADM_audiocodec")
ENDMACRO(INIT_AUDIO_PLUGIN)
MACRO(INSTALL_AUDIODECODER _lib)
diff --git a/cmake/admPluginVideoEncoder.cmake b/cmake/admPluginVideoEncoder.cmake
index e839054..c0ef241 100644
--- a/cmake/admPluginVideoEncoder.cmake
+++ b/cmake/admPluginVideoEncoder.cmake
@@ -6,9 +6,9 @@ ENDIF (WIN32)
MACRO(INIT_VIDEO_ENCODER_PLUGIN _lib)
INCLUDE_DIRECTORIES("${CMAKE_BINARY_DIR}/config")
- INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/../avidemux/ADM_core/include")
- INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/../avidemux/ADM_coreUI/include")
- INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/../avidemux/ADM_plugin")
+ INCLUDE_DIRECTORIES("${AVIDEMUX_SOURCE_DIR}/avidemux/ADM_core/include")
+ INCLUDE_DIRECTORIES("${AVIDEMUX_SOURCE_DIR}/avidemux/ADM_coreUI/include")
+ INCLUDE_DIRECTORIES("${AVIDEMUX_SOURCE_DIR}/avidemux/ADM_plugin")
ENDMACRO(INIT_VIDEO_ENCODER_PLUGIN)
MACRO(INSTALL_VIDEO_ENCODER _lib)
diff --git a/cmake/ae_plugin.cmake b/cmake/ae_plugin.cmake
index 83ba00b..b9da302 100644
--- a/cmake/ae_plugin.cmake
+++ b/cmake/ae_plugin.cmake
@@ -5,10 +5,10 @@ ELSE (WIN32)
ENDIF (WIN32)
MACRO(INIT_AUDIO_ENCODER _lib)
- INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/../avidemux/ADM_core/include")
- INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/../avidemux/ADM_coreAudio/include")
- INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/../avidemux/ADM_coreUI/include")
- INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/../avidemux/ADM_audiofilter")
+ INCLUDE_DIRECTORIES("${AVIDEMUX_SOURCE_DIR}/avidemux/ADM_core/include")
+ INCLUDE_DIRECTORIES("${AVIDEMUX_SOURCE_DIR}/avidemux/ADM_coreAudio/include")
+ INCLUDE_DIRECTORIES("${AVIDEMUX_SOURCE_DIR}/avidemux/ADM_coreUI/include")
+ INCLUDE_DIRECTORIES("${AVIDEMUX_SOURCE_DIR}/avidemux/ADM_audiofilter")
ADD_DEFINITIONS("-DADM_MINIMAL_UI_INTERFACE")
ENDMACRO(INIT_AUDIO_ENCODER)
diff --git a/cmake/av_plugin.cmake b/cmake/av_plugin.cmake
index 61c3a40..2c18b01 100644
--- a/cmake/av_plugin.cmake
+++ b/cmake/av_plugin.cmake
@@ -5,9 +5,9 @@ ELSE (WIN32)
ENDIF (WIN32)
MACRO(INIT_AUDIO_DEVICE _lib)
- INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/../avidemux/ADM_core/include")
- INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/../avidemux/ADM_coreAudio/include")
- INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/../avidemux/ADM_audiodevice/")
+ INCLUDE_DIRECTORIES("${AVIDEMUX_SOURCE_DIR}/avidemux/ADM_core/include")
+ INCLUDE_DIRECTORIES("${AVIDEMUX_SOURCE_DIR}/avidemux/ADM_coreAudio/include")
+ INCLUDE_DIRECTORIES("${AVIDEMUX_SOURCE_DIR}/avidemux/ADM_audiodevice/")
ENDMACRO(INIT_AUDIO_DEVICE)
MACRO(INSTALL_AUDIODEVICE _lib)
2.5.0-coreImage-parallel-build.patch:
--- NEW FILE 2.5.0-coreImage-parallel-build.patch ---
diff --git a/avidemux/ADM_coreImage/src/CMakeLists.txt b/avidemux/ADM_coreImage/src/CMakeLists.txt
index fab38a3..4fc236a 100644
--- a/avidemux/ADM_coreImage/src/CMakeLists.txt
+++ b/avidemux/ADM_coreImage/src/CMakeLists.txt
@@ -20,6 +20,7 @@ SET(ADM_coreImage_SRCS
)
ADD_LIBRARY(ADM_coreImage SHARED ${ADM_coreImage_SRCS})
+ADD_DEPENDENCIES(ADM_coreImage ffmpeg)
ADD_SOURCE_CFLAGS(DIA_flyDialog.cpp " -DADM_UI_TYPE_BUILD=99")
IF (APPLE)
TARGET_LINK_LIBRARIES(ADM_coreImage -Wl,-read_only_relocs,suppress)
2.5.0-fake-inst-dir.patch:
--- NEW FILE 2.5.0-fake-inst-dir.patch ---
diff --git a/avidemux/CMakeLists.txt b/avidemux/CMakeLists.txt
index eda6cff..ae3a349 100644
--- a/avidemux/CMakeLists.txt
+++ b/avidemux/CMakeLists.txt
@@ -501,3 +501,12 @@ IF (APPLE)
ELSE (APPLE)
INSTALL(TARGETS ${ADM_EXES} RUNTIME DESTINATION ${BIN_DIR} LIBRARY DESTINATION lib${LIB_SUFFIX})
ENDIF (APPLE)
+
+IF (UNIX AND NOT APPLE)
+ ADD_CUSTOM_COMMAND(TARGET ffmpeg
+ POST_BUILD
+ COMMAND mkdir -p ${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}
+ COMMAND find ${CMAKE_BINARY_DIR}/avidemux -name '*.so*' | xargs ln -sft ${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}
+ WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+ COMMENT "Creating temporary lib directory for proper plugins linking")
+ENDIF (UNIX AND NOT APPLE)
avidemux-2.5-checkfunction-includes.patch:
--- NEW FILE avidemux-2.5-checkfunction-includes.patch ---
--- avidemux-2.5.0-20090814-r5245.orig/cmake/admConfigHelper.cmake 2009-08-14 19:01:01.828383207 -0400
+++ avidemux-2.5.0-20090814-r5245/cmake/admConfigHelper.cmake 2009-08-14 19:02:02.895383035 -0400
@@ -91,7 +91,7 @@
SET(CHECK_FUNCTION_DEFINE "-DCHECK_FUNCTION_EXISTS=${_function}" ${ARGV4})
SET(CHECK_FUNCTION_LIB ${_lib} ${ARGV3})
- ADM_COMPILE(CheckFunctionExists.c "${CHECK_FUNCTION_DEFINE}" "" "${CHECK_FUNCTION_LIB}" ${_varToSet} OUTPUT)
+ ADM_COMPILE(CheckFunctionExists.c "${CHECK_FUNCTION_DEFINE}" "${AVIDEMUX_SOURCE_DIR}/cmake_compile_check" "${CHECK_FUNCTION_LIB}" ${_varToSet} OUTPUT)
IF (${_varToSet})
MESSAGE(STATUS "Found ${_function} in ${_lib}")
avidemux-2.5-multilib.patch:
--- NEW FILE avidemux-2.5-multilib.patch ---
--- bb/avidemux/ADM_UIs/ADM_CLI/src/CMakeLists.txt 2008-06-10 20:33:07.000000000 -0400
+++ b/avidemux/ADM_UIs/ADM_CLI/src/CMakeLists.txt 2009-08-14 17:29:38.246382892 -0400
@@ -9,4 +9,4 @@
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../include)
ADD_LIBRARY(${ADM_LIB} SHARED ${${ADM_LIB}_SRCS})
ADD_SOURCE_CFLAGS(DIA_flyDialogCli.cpp " -DADM_UI_TYPE_BUILD=1")
-INSTALL(TARGETS ${ADM_LIB} RUNTIME DESTINATION ${BIN_DIR} LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
+INSTALL(TARGETS ${ADM_LIB} RUNTIME DESTINATION ${BIN_DIR} LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib)
--- bb/avidemux/ADM_UIs/ADM_GTK/src/CMakeLists.txt 2009-07-25 10:35:32.000000000 -0400
+++ b/avidemux/ADM_UIs/ADM_GTK/src/CMakeLists.txt 2009-08-14 17:30:04.481383132 -0400
@@ -30,4 +30,4 @@
TARGET_LINK_LIBRARIES(${ADM_LIB} ${GTK_LDFLAGS} ADM_core ADM_coreUI ADM_render_gtk)
ADD_TARGET_CFLAGS(${ADM_LIB} ${GTK_CFLAGS})
ADD_SOURCE_CFLAGS(DIA_flyDialogGtk.cpp " -DADM_UI_TYPE_BUILD=2")
-INSTALL(TARGETS ${ADM_LIB} RUNTIME DESTINATION ${BIN_DIR} LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
\ No newline at end of file
+INSTALL(TARGETS ${ADM_LIB} RUNTIME DESTINATION ${BIN_DIR} LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX})
--- bb/avidemux/ADM_UIs/ADM_QT4/src/CMakeLists.txt 2009-07-28 17:35:56.000000000 -0400
+++ b/avidemux/ADM_UIs/ADM_QT4/src/CMakeLists.txt 2009-08-14 17:30:24.882383103 -0400
@@ -21,4 +21,4 @@
ADD_SOURCE_CFLAGS(T_flyDialogQt4.cpp " -DADM_UI_TYPE_BUILD=4")
ADD_SOURCE_CFLAGS(T_QCanvas.cpp " -DADM_UI_TYPE_BUILD=4")
TARGET_LINK_LIBRARIES(${ADM_LIB} ADM_core ADM_coreUI ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY} ADM_render_qt4)
-INSTALL(TARGETS ${ADM_LIB} RUNTIME DESTINATION ${BIN_DIR} LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
+INSTALL(TARGETS ${ADM_LIB} RUNTIME DESTINATION ${BIN_DIR} LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX})
--- bb/avidemux/ADM_core/src/CMakeLists.txt 2009-07-12 06:08:00.000000000 -0400
+++ b/avidemux/ADM_core/src/CMakeLists.txt 2009-08-14 17:30:36.850382908 -0400
@@ -20,4 +20,4 @@
REMOVE_DEFINITIONS(-DHAVE_CONFIG_H)
include_directories("${FFMPEG_BINARY_DIR}")
-INSTALL(TARGETS ADM_core RUNTIME DESTINATION ${BIN_DIR} LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
+INSTALL(TARGETS ADM_core RUNTIME DESTINATION ${BIN_DIR} LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX})
--- bb/avidemux/ADM_coreAudio/src/CMakeLists.txt 2009-04-21 12:15:51.000000000 -0400
+++ b/avidemux/ADM_coreAudio/src/CMakeLists.txt 2009-08-14 17:31:00.366382862 -0400
@@ -17,4 +17,4 @@
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/avidemux/ADM_coreAudio/include)
TARGET_LINK_LIBRARIES(ADM_coreAudio ADM_core)
-INSTALL(TARGETS ADM_coreAudio RUNTIME DESTINATION ${BIN_DIR} LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
+INSTALL(TARGETS ADM_coreAudio RUNTIME DESTINATION ${BIN_DIR} LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX})
--- bb/avidemux/ADM_coreImage/src/CMakeLists.txt 2009-07-26 07:26:46.000000000 -0400
+++ b/avidemux/ADM_coreImage/src/CMakeLists.txt 2009-08-14 17:31:04.110383244 -0400
@@ -27,4 +27,4 @@
TARGET_LINK_LIBRARIES(ADM_coreImage ADM_core ADM_coreUI ADM_libswscale ADM_libpostproc)
add_dependencies(ADM_coreImage ffmpeg)
-INSTALL(TARGETS ADM_coreImage RUNTIME DESTINATION ${BIN_DIR} LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
+INSTALL(TARGETS ADM_coreImage RUNTIME DESTINATION ${BIN_DIR} LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX})
--- bb/avidemux/ADM_coreUI/src/CMakeLists.txt 2008-06-10 20:33:07.000000000 -0400
+++ b/avidemux/ADM_coreUI/src/CMakeLists.txt 2009-08-14 17:31:07.133382988 -0400
@@ -7,4 +7,4 @@
ADD_LIBRARY(ADM_coreUI SHARED ${ADM_coreUI_SRCS})
TARGET_LINK_LIBRARIES(ADM_coreUI ADM_core)
-INSTALL(TARGETS ADM_coreUI RUNTIME DESTINATION ${BIN_DIR} LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
+INSTALL(TARGETS ADM_coreUI RUNTIME DESTINATION ${BIN_DIR} LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX})
--- bb/avidemux/ADM_libraries/ADM_smjs/CMakeLists.txt 2009-07-11 04:05:39.000000000 -0400
+++ b/avidemux/ADM_libraries/ADM_smjs/CMakeLists.txt 2009-08-14 17:31:09.598382811 -0400
@@ -16,4 +16,4 @@
ADD_TARGET_CFLAGS(${ADM_LIB} "-DNDEBUG -DTRIMMED -DEXPORT_JS_API -DJS_USE_SAFE_ARENA -D_IEEE_LIBM")
TARGET_LINK_LIBRARIES(${ADM_LIB} m)
-INSTALL(TARGETS ${ADM_LIB} RUNTIME DESTINATION ${BIN_DIR} LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
\ No newline at end of file
+INSTALL(TARGETS ${ADM_LIB} RUNTIME DESTINATION ${BIN_DIR} LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX})
--- bb/avidemux/ADM_userInterfaces/ADM_render/CMakeLists.txt 2009-07-11 04:05:39.000000000 -0400
+++ b/avidemux/ADM_userInterfaces/ADM_render/CMakeLists.txt 2009-08-14 17:31:23.759383038 -0400
@@ -31,7 +31,7 @@
TARGET_LINK_LIBRARIES(${ADM_LIB}_gtk ${XVIDEO_LIBRARY_DIR} X11 Xext)
ENDIF (USE_XV)
- INSTALL(TARGETS ${ADM_LIB}_gtk RUNTIME DESTINATION ${BIN_DIR} LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
+ INSTALL(TARGETS ${ADM_LIB}_gtk RUNTIME DESTINATION ${BIN_DIR} LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX})
ENDIF (ADM_UI_GTK)
IF (ADM_UI_QT4)
@@ -43,11 +43,11 @@
TARGET_LINK_LIBRARIES(${ADM_LIB}_qt4 ${XVIDEO_LIBRARY_DIR} X11 Xext)
ENDIF (USE_XV)
- INSTALL(TARGETS ${ADM_LIB}_qt4 RUNTIME DESTINATION ${BIN_DIR} LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
+ INSTALL(TARGETS ${ADM_LIB}_qt4 RUNTIME DESTINATION ${BIN_DIR} LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX})
ENDIF (ADM_UI_QT4)
IF (GETTEXT_FOUND)
TARGET_LINK_LIBRARIES(${ADM_LIB}_cli ${GETTEXT_LIBRARY_DIR})
ENDIF (GETTEXT_FOUND)
-INSTALL(TARGETS ${ADM_LIB}_cli RUNTIME DESTINATION ${BIN_DIR} LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
\ No newline at end of file
+INSTALL(TARGETS ${ADM_LIB}_cli RUNTIME DESTINATION ${BIN_DIR} LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX})
--- bb/cmake/ad_plugin.cmake 2009-02-13 18:29:49.000000000 -0500
+++ b/cmake/ad_plugin.cmake 2009-08-14 17:32:25.741383149 -0400
@@ -1,7 +1,7 @@
IF (WIN32)
SET(AUDDEC_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/plugins/audioDecoder/")
ELSE (WIN32)
- SET(AUDDEC_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib/ADM_plugins/audioDecoder/")
+ SET(AUDDEC_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/ADM_plugins/audioDecoder/")
ENDIF (WIN32)
MACRO(INIT_AUDIO_PLUGIN _lib)
--- bb/cmake/admFFmpegBuild.cmake 2009-08-03 14:39:09.000000000 -0400
+++ b/cmake/admFFmpegBuild.cmake 2009-08-14 17:32:53.399383055 -0400
@@ -132,7 +132,7 @@
if (WIN32)
set(FFMPEG_INSTALL_DIR ${BIN_DIR})
else (WIN32)
- set(FFMPEG_INSTALL_DIR lib)
+ set(FFMPEG_INSTALL_DIR lib${LIB_SUFFIX})
endif (WIN32)
add_library(ADM_libswscale UNKNOWN IMPORTED)
--- bb/cmake/admPluginVideoEncoder.cmake 2009-02-13 18:29:49.000000000 -0500
+++ b/cmake/admPluginVideoEncoder.cmake 2009-08-14 17:33:08.024383061 -0400
@@ -1,7 +1,7 @@
IF (WIN32)
SET(VIDENC_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/plugins/videoEncoder/")
ELSE (WIN32)
- SET(VIDENC_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib/ADM_plugins/videoEncoder/")
+ SET(VIDENC_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/ADM_plugins/videoEncoder/")
ENDIF (WIN32)
MACRO(INIT_VIDEO_ENCODER_PLUGIN _lib)
--- bb/cmake/ae_plugin.cmake 2009-02-13 18:29:49.000000000 -0500
+++ b/cmake/ae_plugin.cmake 2009-08-14 17:33:16.187382961 -0400
@@ -1,7 +1,7 @@
IF (WIN32)
SET(AUDENC_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/plugins/audioEncoders/")
ELSE (WIN32)
- SET(AUDENC_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib/ADM_plugins/audioEncoders/")
+ SET(AUDENC_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/ADM_plugins/audioEncoders/")
ENDIF (WIN32)
MACRO(INIT_AUDIO_ENCODER _lib)
--- bb/cmake/av_plugin.cmake 2009-02-13 18:29:49.000000000 -0500
+++ b/cmake/av_plugin.cmake 2009-08-14 17:33:17.689383198 -0400
@@ -1,7 +1,7 @@
IF (WIN32)
SET(AUDDEV_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/plugins/audioDevices/")
ELSE (WIN32)
- SET(AUDDEV_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib/ADM_plugins/audioDevices/")
+ SET(AUDDEV_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/ADM_plugins/audioDevices/")
ENDIF (WIN32)
MACRO(INIT_AUDIO_DEVICE _lib)
--- bb/cmake/vf_plugin.cmake 2009-02-13 18:29:49.000000000 -0500
+++ b/cmake/vf_plugin.cmake 2009-08-14 17:33:22.073382915 -0400
@@ -1,7 +1,7 @@
IF (WIN32)
SET(VIDFLT_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/plugins/videoFilter/")
ELSE (WIN32)
- SET(VIDFLT_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib/ADM_plugins/videoFilter/")
+ SET(VIDFLT_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/ADM_plugins/videoFilter/")
ENDIF (WIN32)
MACRO(INIT_VIDEOFILTER_PLUGIN _lib)
--- bb/plugins/CMakeLists.txt 2009-02-21 12:26:30.000000000 -0500
+++ b/plugins/CMakeLists.txt 2009-08-14 17:33:47.166383358 -0400
@@ -43,7 +43,7 @@
SET(AVIDEMUX_INSTALL_PREFIX "${AVIDEMUX_INSTALL_PREFIX}" CACHE STRING "")
ENDIF (NOT AVIDEMUX_INSTALL_PREFIX)
-LINK_DIRECTORIES(${AVIDEMUX_INSTALL_PREFIX}/lib)
+LINK_DIRECTORIES(${AVIDEMUX_INSTALL_PREFIX}/lib${LIB_SUFFIX})
########################################
# Where is coreConfig ?
@@ -98,7 +98,7 @@
ENDIF (CMAKE_BUILD_TYPE STREQUAL "Release")
ELSE (WIN32)
SET(BIN_DIR bin)
- set(FFMPEG_LIB_DIR ${AVIDEMUX_INSTALL_PREFIX}/lib)
+ set(FFMPEG_LIB_DIR ${AVIDEMUX_INSTALL_PREFIX}/lib${LIB_SUFFIX})
ENDIF (WIN32)
########################################
--- avidemux-2.5.0-20090814-r5245/avidemux/CMakeLists.txt 2009-07-30 14:20:15.000000000 -0400
+++ avidemux-2.5.0-20090814-r5245.new/avidemux/CMakeLists.txt 2009-08-14 18:16:29.768383121 -0400
@@ -499,5 +499,5 @@
SET (MAC_BUNDLE_DIR "/Applications")
ENDIF (MAC_BUNDLE_DIR)
ELSE (APPLE)
- INSTALL(TARGETS ${ADM_EXES} RUNTIME DESTINATION ${BIN_DIR} LIBRARY DESTINATION lib)
+ INSTALL(TARGETS ${ADM_EXES} RUNTIME DESTINATION ${BIN_DIR} LIBRARY DESTINATION lib${LIB_SUFFIX})
ENDIF (APPLE)
--- ../plugins/ADM_videoEncoder/ADM_vidEnc_avcodec/CMakeLists.txt.orig 2009-08-14 19:22:29.234382916 -0400
+++ ../plugins/ADM_videoEncoder/ADM_vidEnc_avcodec/CMakeLists.txt 2009-08-14 19:22:40.756383660 -0400
@@ -5,7 +5,7 @@
if (WIN32)
set(FFMPEG_INSTALL_DIR ${AVIDEMUX_INSTALL_PREFIX})
else (WIN32)
- set(FFMPEG_INSTALL_DIR ${AVIDEMUX_INSTALL_PREFIX}/lib)
+ set(FFMPEG_INSTALL_DIR ${AVIDEMUX_INSTALL_PREFIX}/lib${LIB_SUFFIX})
endif (WIN32)
SET(ADM_vidEnc_avcodec_SRCS interface.c encoder.cpp huffyuvEncoder.cpp
@@ -29,4 +29,4 @@
INIT_VIDEO_ENCODER_PLUGIN(ADM_vidEnc_avcodec)
INSTALL_VIDEO_ENCODER(ADM_vidEnc_avcodec)
-INSTALL(FILES Mpeg1Param.xsd DESTINATION "${VIDENC_INSTALL_DIR}${PLUGIN_SCHEMA_DIR}")
\ No newline at end of file
+INSTALL(FILES Mpeg1Param.xsd DESTINATION "${VIDENC_INSTALL_DIR}${PLUGIN_SCHEMA_DIR}")
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/avidemux/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 31 Jul 2009 00:45:49 -0000 1.5
+++ .cvsignore 15 Aug 2009 00:00:36 -0000 1.6
@@ -1 +1 @@
-avidemux_2.5.0.tar.gz
+avidemux-2.5.0-20090814-r5245.tar.bz2
Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/F-11/avidemux.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- avidemux.spec 6 Aug 2009 00:13:04 -0000 1.27
+++ avidemux.spec 15 Aug 2009 00:00:36 -0000 1.28
@@ -1,33 +1,29 @@
Name: avidemux
Version: 2.5.0
-Release: 6%{?dist}
+Release: 7.20090814svn%{?dist}
Summary: Graphical video editing and transcoding tool
Group: Applications/Multimedia
License: GPLv2+
URL: http://www.avidemux.org/
-Source0: http://download.berlios.de/avidemux/avidemux_%{version}.tar.gz
+#Source0: http://download.berlios.de/avidemux/avidemux_%{version}.tar.gz
+# svn co svn://svn.berlios.de/avidemux/branches/avidemux_2.5_branch_gruntster
+# svn export . ../avidemux-2.5.0-20090814-r5245
+# tar cfj avidemux-2.5.0-20090814-r5245.tar.bz2 avidemux-2.5.0-20090814-r5245
+Source0: avidemux-%{version}-20090814-r5245.tar.bz2
Source1: %{name}-gtk.desktop
Source2: %{name}-qt.desktop
-# Make PulseAudio the default audio out device
-Patch0: avidemux-2.5-pulseaudio-default.patch
-# Search for lrelease-qt4 instead of lrelease
-Patch1: avidemux-2.4-qt4.patch
-# Move translations out of bindir
-Patch2: avidemux-2.5-i18n.patch
-# Fix libdir location on 64bit
-# Move scripts & plugins avidemux subdir instead of in libdir or datadir
-Patch3: avidemux-2.5-filelocations.patch
-# Fixes for gcc 4.4
-# Patch from http://arklinux.ch/~bero/avidemux-2.5.0-gcc-4.4.patch
-Patch4: avidemux-2.5-gcc-44.patch
-# Fixes altivec build errors on PPC
-Patch5: avidemux-2.5-libmpeg2enc-altivec.patch
-### Patches for plugins
-# Install to correct libdir on 64bit and moves plugins into avidemux subdir
-Patch6: avidemux-plugins-2.5-plugdir.patch
-# Fixes for gcc 4.4 (plugins)
-Patch7: avidemux-plugins-2.5-gcc44.patch
+Patch0: avidemux-2.5-multilib.patch
+# Patches 1-3 obtained from avidemux-2.5.0-patches-1.tar.bz2:
+# http://mirror.csclub.uwaterloo.ca/gentoo-distfiles/distfiles/avidemux-2.5...
+Patch1: 2.5.0-build-plugins.patch
+Patch2: 2.5.0-coreImage-parallel-build.patch
+Patch3: 2.5.0-fake-inst-dir.patch
+Patch4: avidemux-2.5-pulseaudio-default.patch
+Patch5: avidemux-2.4-qt4.patch
+Patch6: avidemux-2.5-i18n.patch
+Patch7: avidemux-2.5-libmpeg2enc-altivec.patch
+Patch8: avidemux-2.5-checkfunction-includes.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -152,57 +148,44 @@
This package contains various plugins for avidemux.
%prep
-%setup -q -n avidemux_%{version}
-%patch0 -p1 -b .pulse
-%patch1 -p1 -b .qt4
-%patch2 -p1 -b .i18n
-%patch3 -p1 -b .lib64
+%setup -q -n avidemux-%{version}-20090814-r5245
+
# change hardcoded libdir paths
-%ifarch x86_64
+%ifarch x86_64 ppc64
sed -i.bak 's/startDir="lib";/startDir="lib64";/' avidemux/ADM_core/src/ADM_fileio.cpp
sed -i.bak 's/startDir="lib";/startDir="lib64";/' avidemux/main.cpp
%endif
-%patch4 -p1 -b .gcc44
-%patch5 -p1 -b .altivec
-%patch6 -p1 -b .plugdir
-%patch7 -p1 -b .pluggcc44
+
+%patch0 -p1 -b .multilib
+%patch1 -p1 -b .plugins
+%patch2 -p1 -b .ciparallel
+%patch3 -p1 -b .fakeinstdir
+%patch4 -b .pulse
+%patch5 -p1 -b .qt4
+%patch6 -p1 -b .i18n
+%patch7 -p1 -b .altivec
+%patch8 -p1 -b .cfincludes
+
%build
# Out of source build
-mkdir build build_plugins && cd build
-%cmake ../
-# po/ not smp safe - http://bugs.avidemux.org/index.php?do=details&task_id=605
-#make -C po
-# smp_mflags seems to break on the buildsys
-#make %{?_smp_mflags}
-make
-
-# Do a local install to build plugins
-make install DESTDIR=%{_builddir}/avidemux_%{version}/localinstall
-
-mkdir avidemux_%{version}/build_plugins avidemux_%{version}/build && cd avidemux_%{version}/build
-%cmake ../
-cd ../build_plugins
-%cmake -DAVIDEMUX_SOURCE_DIR=%{_builddir}/avidemux_%{version} \
- -DAVIDEMUX_CORECONFIG_DIR=%{_builddir}/avidemux_%{version}/build/config \
- -DAVIDEMUX_INSTALL_PREFIX=%{_builddir}/avidemux_%{version}/localinstall/%{_prefix} \
- ../plugins
-# See note above, this doesn't always work properly
-#make %{?_smp_mflags}
-make
+mkdir build && cd build
+%cmake -DAVIDEMUX_SOURCE_DIR=%{_builddir}/avidemux-%{version}-20090814-r5245 \
+ -DAVIDEMUX_INSTALL_PREFIX=%{_builddir}/avidemux-%{version}-20090814-r5245/build \
+ -DAVIDEMUX_CORECONFIG_DIR=%{_builddir}/avidemux-%{version}-20090814-r5245/build/config \
+ ../
+make %{?_smp_mflags}
+make -C plugins %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
-# Install main to $RPM_BUILD_ROOT
cd build
make install DESTDIR=$RPM_BUILD_ROOT
+make -C plugins install DESTDIR=$RPM_BUILD_ROOT
+# Install the build configuration for devel package
install -d -m755 $RPM_BUILD_ROOT%{_includedir}
install -m644 config/ADM_coreConfig.h $RPM_BUILD_ROOT%{_includedir}/ADM_coreConfig.h
-%find_lang %{name}
-# Install plugins to $RPM_BUILD_ROOT
-cd ../build_plugins
-make install DESTDIR=$RPM_BUILD_ROOT
# Find and remove all la files
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
@@ -216,6 +199,8 @@
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
%{SOURCE2}
+%find_lang %{name}
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -229,7 +214,7 @@
%files libs -f build/%{name}.lang
%doc AUTHORS COPYING README TODO
%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/ADM_scripts/
+%{_datadir}/ADM_scripts/
%{_libdir}/libADM*
%files cli
@@ -256,6 +241,11 @@
%{_includedir}/ADM_coreConfig.h
%changelog
+* Fri Aug 14 2009 Stewart Adam <s.adam at diffingo.com> - 2.5.0-7.20090814svn
+- Update to 2.5.0 subversion r5245
+- Apply additional patches from Gentoo ebuild
+- Re-enable PPC* builds as well as smp_mflags
+
* Mon Aug 5 2009 Stewart Adam <s.adam at diffingo.com> - 2.5.0-6
- Attempt a build with ppc enabled, smp_mflags disabled
Index: sources
===================================================================
RCS file: /cvs/free/rpms/avidemux/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 31 Jul 2009 00:45:49 -0000 1.5
+++ sources 15 Aug 2009 00:00:36 -0000 1.6
@@ -1 +1 @@
-69624352ac4e4cbb507e02b2bace5f56 avidemux_2.5.0.tar.gz
+a2253e4bcdc597cadf443f458acd11de avidemux-2.5.0-20090814-r5245.tar.bz2
--- avidemux-2.4-pulseaudio-default.patch DELETED ---
--- avidemux-2.5-filelocations.patch DELETED ---
--- avidemux-2.5-gcc-44.patch DELETED ---
--- avidemux-plugins-2.5-gcc44.patch DELETED ---
--- avidemux-plugins-2.5-plugdir.patch DELETED ---
15 years, 3 months
rpms/VirtualBox-OSE-kmod/F-11 VirtualBox-OSE-kmod.spec,1.21,1.22
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/VirtualBox-OSE-kmod/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv21444
Modified Files:
VirtualBox-OSE-kmod.spec
Log Message:
* Fri Aug 14 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.0.4-2.1
- rebuild for new kernels
Index: VirtualBox-OSE-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE-kmod/F-11/VirtualBox-OSE-kmod.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- VirtualBox-OSE-kmod.spec 9 Aug 2009 18:10:08 -0000 1.21
+++ VirtualBox-OSE-kmod.spec 14 Aug 2009 20:17:09 -0000 1.22
@@ -3,11 +3,11 @@
# "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
Name: VirtualBox-OSE-kmod
Version: 3.0.4
-Release: 2%{?dist}
+Release: 2%{?dist}.1
Summary: Kernel module for VirtualBox-OSE
Group: System Environment/Kernel
@@ -85,6 +85,9 @@
%changelog
+* Fri Aug 14 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.0.4-2.1
+- rebuild for new kernels
+
* Sun Aug 09 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.4-1
- New release
- Check that we build all modules present
15 years, 3 months
rpms/sysprof-kmod/F-11 sysprof-kmod.spec,1.14,1.15
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/sysprof-kmod/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv21323
Modified Files:
sysprof-kmod.spec
Log Message:
* Fri Aug 14 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.0.12-2.13
- rebuild for new kernels
Index: sysprof-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/sysprof-kmod/F-11/sysprof-kmod.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sysprof-kmod.spec 31 Jul 2009 05:04:57 -0000 1.14
+++ sysprof-kmod.spec 14 Aug 2009 20:16:51 -0000 1.15
@@ -8,7 +8,7 @@
Name: sysprof-kmod
Summary: Kernel module for sysprof
Version: 1.0.12
-Release: 2%{?dist}.12
+Release: 2%{?dist}.13
Group: System Environment/Kernel
License: GPLv2+
@@ -73,6 +73,9 @@
%changelog
+* Fri Aug 14 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.0.12-2.13
+- rebuild for new kernels
+
* Fri Jul 31 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.0.12-2.12
- rebuild for new kernels
15 years, 3 months
rpms/rt3070-kmod/F-11 rt3070-kmod.spec,1.17,1.18
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/rt3070-kmod/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv21200
Modified Files:
rt3070-kmod.spec
Log Message:
* Fri Aug 14 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.1.1.0-1.7
- rebuild for new kernels
Index: rt3070-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/rt3070-kmod/F-11/rt3070-kmod.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- rt3070-kmod.spec 31 Jul 2009 05:04:41 -0000 1.17
+++ rt3070-kmod.spec 14 Aug 2009 20:16:36 -0000 1.18
@@ -7,7 +7,7 @@
Name: rt3070-kmod
Version: 2.1.1.0
-Release: 1%{?dist}.6
+Release: 1%{?dist}.7
Summary: Kernel module for wireless devices with Ralink's rt307x chipsets
Group: System Environment/Kernel
@@ -93,6 +93,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Aug 14 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.1.1.0-1.7
+- rebuild for new kernels
+
* Fri Jul 31 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.1.1.0-1.6
- rebuild for new kernels
15 years, 3 months