packages: avidemux/avidemux.spec - reversed last commit log (I don't know w...

lisu lisu at pld-linux.org
Thu Jul 7 14:00:31 CEST 2011


Author: lisu                         Date: Thu Jul  7 12:00:31 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- reversed last commit log (I don't know why avidemux didn't build)
- use sed macro

---- Files affected:
packages/avidemux:
   avidemux.spec (1.101 -> 1.102) 

---- Diffs:

================================================================
Index: packages/avidemux/avidemux.spec
diff -u packages/avidemux/avidemux.spec:1.101 packages/avidemux/avidemux.spec:1.102
--- packages/avidemux/avidemux.spec:1.101	Wed Jul  6 22:44:41 2011
+++ packages/avidemux/avidemux.spec	Thu Jul  7 14:00:26 2011
@@ -112,7 +112,7 @@
 echo 'pt_BR' >> po/LINGUAS
 
 # libdir fix
-sed -i -e's,"lib","%{_lib}",' avidemux/main.cpp avidemux/ADM_core/src/ADM_fileio.cpp
+%{__sed} -i -e's,"lib","%{_lib}",' avidemux/main.cpp avidemux/ADM_core/src/ADM_fileio.cpp
 
 %build
 TOP=$PWD
@@ -139,14 +139,19 @@
 # plugins
 cd plugins/build
 %cmake \
+	-DCMAKE_BUILD_TYPE=%{?debug:Debug}%{!?debug:Release} \
+	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
 	-DAVIDEMUX_INSTALL_PREFIX=$TOP/build \
-	-DAVIDEMUX_SOURCE_DIR=$TOP/  \
+	-DAVIDEMUX_SOURCE_DIR=$TOP/ \
 	-DAVIDEMUX_CORECONFIG_DIR=$TOP/build/config \
 	%{!?with_arts:-DARTS=0} \
 	%{!?with_esd:-DESD=0} \
 	%{!?with_amr:-DOPENCORE_AMRNB=0 -DOPENCORE_AMRWB=0} \
 	%{!?with_gtk:-DGTK=0} \
 	%{!?with_qt4:-DQT4=0} \
+%if "%{_lib}" == "lib64"
+	-DLIB_SUFFIX=64 \
+%endif
 	..
 
 %{__make}
@@ -411,6 +416,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.102  2011/07/07 12:00:26  lisu
+- reversed last commit log (I don't know why avidemux didn't build)
+- use sed macro
+
 Revision 1.101  2011/07/06 20:44:41  lisu
 - dropped rest of cmake options provided by cmake macro
 
================================================================

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



More information about the pld-cvs-commit mailing list