packages (DEVEL): avidemux/avidemux.spec - builds now

[glen]

Author: glen                         Date: Wed Dec 16 14:50:34 2009 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- builds now

---- Files affected:
packages/avidemux:
   avidemux.spec (1.71.2.2 -> 1.71.2.3) 

---- Diffs:

================================================================
Index: packages/avidemux/avidemux.spec
diff -u packages/avidemux/avidemux.spec:1.71.2.2 packages/avidemux/avidemux.spec:1.71.2.3
--- packages/avidemux/avidemux.spec:1.71.2.2	Wed Jul  8 01:07:57 2009
+++ packages/avidemux/avidemux.spec	Wed Dec 16 15:50:28 2009
@@ -2,22 +2,29 @@
 # TODO:
 # - create aften.spec (aften.sf.net) and use it
 # - needs some cmake magican to fixup the bconds
-# - use external seamonkey (cmake fix needed)
+# - use external seamonkey (cmake fix needed): Checking for SpiderMonkey -- Skipping check and using bundled version.
 # - sync or use .desktop from sources
 # - subpackages per ui engine
 # - uses patched ffmpeg
+# - the bconds don't work with cmake, all gets enabled if BR found
+# - Could not find Gettext -- libintl not required for gettext support
+# - fix lib64 libdir install
+# - i18n in /usr/bin/i18n
+# - missing autodep for libva.so.1
 #
 # Conditional build:
 %bcond_without	esd	# disable EsounD sound support
 %bcond_without	arts	# without arts audio output
 %bcond_with	amr	# enable 3GPP Adaptive Multi Rate (AMR) speech codec support
-%bcond_with	qt	# build qt4-base interface
+%bcond_without	qt4	# build qt4-base interface
 %bcond_with	ssse3	# use SSSE3 instructions
 
 %ifarch pentium4 %{x8664}
 %define		with_sse3	1
 %endif
 
+%define		qt4_version	4.2
+
 Summary:	A small audio/video editing software for Linux
 Summary(pl.UTF-8):	Mały edytor audio/wideo dla Linuksa
 Name:		avidemux
@@ -30,11 +37,11 @@
 Source1:	%{name}.desktop
 Patch0:		gcc44.patch
 Patch1:		types.patch
-#Patch0:		%{name}-autoconf.patch
-#Patch1:		%{name}-dts_internal.patch
-#Patch2:		%{name}-sparc64.patch
+#Patch0:	%{name}-autoconf.patch
+#Patch1:	%{name}-dts_internal.patch
+#Patch2:	%{name}-sparc64.patch
 URL:		http://fixounet.free.fr/avidemux/
-%{?with_qt:BuildRequires:	QtGui-devel}
+%{?with_qt4:BuildRequires:	QtGui-devel >= %{qt4_version}}
 BuildRequires:	SDL-devel
 BuildRequires:	a52dec-libs-devel
 BuildRequires:	alsa-lib-devel >= 1.0
@@ -59,13 +66,14 @@
 BuildRequires:	libx264-devel
 BuildRequires:	libxml2-devel
 BuildRequires:	pkgconfig
-%{?with_qt:BuildRequires:	qt4-build}
+%{?with_qt4:BuildRequires:	qt4-build >= %{qt4_version}}
 BuildRequires:	sed >= 4.0
 BuildRequires:	sed >= 4.0
 BuildRequires:	xorg-lib-libXt-devel
 BuildRequires:	xorg-lib-libXv-devel
 BuildRequires:	xorg-proto-xextproto-devel
 BuildRequires:	xvid-devel >= 1:1.0
+BuildRequires:	zlib-devel
 Requires:	js(threads)
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -91,21 +99,30 @@
 install -d build
 cd build
 %cmake \
-	-DCMAKE_INSTALL_DIR=/usr \
 	-DCMAKE_BUILD_TYPE=%{?debug:Debug}%{!?debug:Release} \
+	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
+%if "%{_lib}" == "lib64"
+	-DLIB_SUFFIX=64 \
+%endif
 	..
-%{__make}
+%{__make} -j1
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
+install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},%{_bindir}}
 
-%{__make} install \
+%{__make} -C build install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
+%if "%{_lib}" != "lib"
+mv $RPM_BUILD_ROOT{%{_prefix}/lib,%{_libdir}}
+%endif
+
+chmod +x $RPM_BUILD_ROOT%{_libdir}/lib*.so
+
+cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 cp -a avidemux_icon.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
-install -p avidemux/avidemux2_gtk $RPM_BUILD_ROOT%{_bindir}/avidemux2_gtk
+install -p build/avidemux/avidemux2_gtk $RPM_BUILD_ROOT%{_bindir}/avidemux2_gtk
 
 %find_lang %{name}
 
@@ -114,10 +131,27 @@
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS History
+%doc AUTHORS
 %attr(755,root,root) %{_bindir}/avidemux2_cli
 %attr(755,root,root) %{_bindir}/avidemux2_gtk
-%{?with_qt:%attr(755,root,root) %{_bindir}/avidemux2_qt4}
+%{?with_qt4:%attr(755,root,root) %{_bindir}/avidemux2_qt4}
+%attr(755,root,root) %{_libdir}/libADM5avcodec.so.52
+%attr(755,root,root) %{_libdir}/libADM5avformat.so.52
+%attr(755,root,root) %{_libdir}/libADM5avutil.so.50
+%attr(755,root,root) %{_libdir}/libADM5postproc.so.51
+%attr(755,root,root) %{_libdir}/libADM5swscale.so.0
+%attr(755,root,root) %{_libdir}/libADM_UICli.so
+%attr(755,root,root) %{_libdir}/libADM_UIGtk.so
+%attr(755,root,root) %{_libdir}/libADM_UIQT4.so
+%attr(755,root,root) %{_libdir}/libADM_core.so
+%attr(755,root,root) %{_libdir}/libADM_coreAudio.so
+%attr(755,root,root) %{_libdir}/libADM_coreImage.so
+%attr(755,root,root) %{_libdir}/libADM_coreUI.so
+%attr(755,root,root) %{_libdir}/libADM_render_cli.so
+%attr(755,root,root) %{_libdir}/libADM_render_gtk.so
+%{?with_qt4:%attr(755,root,root) %{_libdir}/libADM_render_qt4.so}
+%attr(755,root,root) %{_libdir}/libADM_smjs.so
+%{_datadir}/ADM_scripts
 %{_desktopdir}/*.desktop
 %{_pixmapsdir}/*.png
 
@@ -127,6 +161,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.71.2.3  2009/12/16 14:50:28  glen
+- builds now
+
 Revision 1.71.2.2  2009/07/07 23:07:57  glen
 - gcc and types fixes
 
================================================================

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