packages (DEVEL): avidemux/avidemux.spec, avidemux/libdir.patch (NEW) - lib...

[glen]

Author: glen                         Date: Thu Dec 17 16:59:15 2009 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- lib64 fix

---- Files affected:
packages/avidemux:
   avidemux.spec (1.71.2.9 -> 1.71.2.10) , libdir.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/avidemux/avidemux.spec
diff -u packages/avidemux/avidemux.spec:1.71.2.9 packages/avidemux/avidemux.spec:1.71.2.10
--- packages/avidemux/avidemux.spec:1.71.2.9	Thu Dec 17 16:48:44 2009
+++ packages/avidemux/avidemux.spec	Thu Dec 17 17:59:09 2009
@@ -36,6 +36,7 @@
 Patch1:		types.patch
 Patch2:		qtlocale.patch
 Patch3:		link-libs.patch
+Patch4:		libdir.patch
 #Patch1:	%{name}-dts_internal.patch
 #Patch2:	%{name}-sparc64.patch
 URL:		http://fixounet.free.fr/avidemux/
@@ -93,6 +94,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 echo 'pt_BR' >> po/LINGUAS
 
@@ -209,6 +211,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.71.2.10  2009/12/17 16:59:09  glen
+- lib64 fix
+
 Revision 1.71.2.9  2009/12/17 15:48:44  glen
 - build plugins, install avidemux manual
 

================================================================
Index: packages/avidemux/libdir.patch
diff -u /dev/null packages/avidemux/libdir.patch:1.1
--- /dev/null	Thu Dec 17 17:59:15 2009
+++ packages/avidemux/libdir.patch	Thu Dec 17 17:59:09 2009
@@ -0,0 +1,55 @@
+--- avidemux_2.5.1/cmake/av_plugin.cmake~	2009-12-17 18:54:56.000000000 +0200
++++ avidemux_2.5.1/cmake/av_plugin.cmake	2009-12-17 18:56:51.459214578 +0200
+@@ -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)
+--- avidemux_2.5.1/cmake/vf_plugin.cmake~	2009-12-17 18:54:56.000000000 +0200
++++ avidemux_2.5.1/cmake/vf_plugin.cmake	2009-12-17 18:57:23.572247309 +0200
+@@ -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)
+--- avidemux_2.5.1/cmake/ae_plugin.cmake~	2009-12-17 18:54:56.000000000 +0200
++++ avidemux_2.5.1/cmake/ae_plugin.cmake	2009-12-17 18:57:36.368836466 +0200
+@@ -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)
+--- avidemux_2.5.1/cmake/admPluginVideoEncoder.cmake~	2009-12-17 18:54:56.000000000 +0200
++++ avidemux_2.5.1/cmake/admPluginVideoEncoder.cmake	2009-12-17 18:57:48.648836334 +0200
+@@ -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)
+--- avidemux_2.5.1/cmake/ad_plugin.cmake~	2009-12-17 18:54:56.000000000 +0200
++++ avidemux_2.5.1/cmake/ad_plugin.cmake	2009-12-17 18:58:01.986126156 +0200
+@@ -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)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/avidemux/avidemux.spec?r1=1.71.2.9&r2=1.71.2.10&f=u