packages: avidemux/avidemux.spec, avidemux/link-libs.patch (REMOVED) - simp...

[glen]

Author: glen                         Date: Thu Dec 17 20:05:33 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- simplify plugins building (idea from archlinux), no need for -L patch anymore

---- Files affected:
packages/avidemux:
   avidemux.spec (1.76 -> 1.77) , link-libs.patch (1.4 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/avidemux/avidemux.spec
diff -u packages/avidemux/avidemux.spec:1.76 packages/avidemux/avidemux.spec:1.77
--- packages/avidemux/avidemux.spec:1.76	Thu Dec 17 20:04:48 2009
+++ packages/avidemux/avidemux.spec	Thu Dec 17 21:05:28 2009
@@ -1,6 +1,7 @@
 # $Revision$, $Date$
 # TODO:
-# - create aften.spec (aften.sf.net) and use it
+# - create aften.spec (aften.sf.net) and use it -D USE_AFTEN=1
+# - amr bcond - -D USE_AMR_NB=1
 # - the bconds don't work with cmake, all gets enabled if BR found -- needs some cmake magican to fixup the bconds
 # - use external seamonkey (cmake fix needed): Checking for SpiderMonkey -- Skipping check and using bundled version.
 # - uses patched ffmpeg
@@ -37,8 +38,7 @@
 Patch0:		gcc44.patch
 Patch1:		types.patch
 Patch2:		qtlocale.patch
-Patch3:		link-libs.patch
-Patch4:		libdir.patch
+Patch3:		libdir.patch
 #Patch1:	%{name}-dts_internal.patch
 #Patch2:	%{name}-sparc64.patch
 URL:		http://fixounet.free.fr/avidemux/
@@ -116,7 +116,6 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 
 echo 'pt_BR' >> po/LINGUAS
 
@@ -128,7 +127,7 @@
 %build
 TOP=$PWD
 # main
-install -d build plugin-build
+install -d build/lib plugins/build
 cd build
 %cmake \
 	-DCMAKE_BUILD_TYPE=%{?debug:Debug}%{!?debug:Release} \
@@ -141,14 +140,19 @@
 %endif
 	..
 %{__make}
-cd ..
+
+# plugin build expects libraries to be already installed; we fake a prefix
+# in build/ by symlinking all libraries to build/lib/
+cd lib
+find ../avidemux -name '*.so*' | xargs ln -sft .
+cd ../..
 
 # plugins
-cd plugin-build
+cd plugins/build
 %cmake \
 	-DCMAKE_BUILD_TYPE=%{?debug:Debug}%{!?debug:Release} \
 	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
-	-DAVIDEMUX_INSTALL_PREFIX=%{_prefix} \
+	-DAVIDEMUX_INSTALL_PREFIX=$TOP/build \
 	-DAVIDEMUX_SOURCE_DIR=$TOP/  \
 	-DAVIDEMUX_CORECONFIG_DIR=$TOP/build/config \
 	%{!?with_gtk:-DNO_GTK=1 -DADM_UI_GTK=0} \
@@ -156,7 +160,9 @@
 %if "%{_lib}" == "lib64"
 	-DLIB_SUFFIX=64 \
 %endif
-	../plugins
+	..
+
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -165,7 +171,7 @@
 %{__make} -C build install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-%{__make} -C plugin-build install \
+%{__make} -C plugins/build install \
 	DESTDIR=$RPM_BUILD_ROOT
 
 chmod +x $RPM_BUILD_ROOT%{_libdir}/lib*.so*
@@ -364,6 +370,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.77  2009/12/17 20:05:28  glen
+- simplify plugins building (idea from archlinux), no need for -L patch anymore
+
 Revision 1.76  2009/12/17 19:04:48  sparky
 - amr switched to opencore-amr; enabled by default
 
================================================================

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