Author: sparky Date: Wed Feb 3 12:49:09 2010 GMT Module: packages Tag: HEAD ---- Log message: - readded BR: libx264-devel; todo dropped - fixed lrelease detection, BR: qt4-linguist - droped unused BR: libtool, xorg-lib-libXt-devel - commented out unused BR: a52dec-libs-devel, js-devel(threads), libdts-devel, libmad-devel, libmpeg3-devel -- some may be wrong, please revise
---- Files affected: packages/avidemux: avidemux.spec (1.82 -> 1.83) ---- Diffs: ================================================================ Index: packages/avidemux/avidemux.spec diff -u packages/avidemux/avidemux.spec:1.82 packages/avidemux/avidemux.spec:1.83 --- packages/avidemux/avidemux.spec:1.82 Wed Feb 3 10:15:20 2010 +++ packages/avidemux/avidemux.spec Wed Feb 3 13:49:03 2010 @@ -5,8 +5,6 @@ # - use external spidermonkey (cmake fix needed): Checking for SpiderMonkey -- Skipping check and using bundled version. # - uses patched ffmpeg # - don't force -O3 optimization -# - look for lrelease from qt4-linguist, not qt-linguist -# - uses some internal x264 functions, our x264 is to new for it # # Conditional build: %bcond_without esd # disable EsounD sound support @@ -36,7 +34,7 @@ URL: http://fixounet.free.fr/avidemux/ %{?with_qt4:BuildRequires: QtGui-devel >= %{qt4_version}} BuildRequires: SDL-devel -BuildRequires: a52dec-libs-devel +#BuildRequires: a52dec-libs-devel BuildRequires: alsa-lib-devel >= 1.0 %{?with_arts:BuildRequires: artsc-devel} BuildRequires: cmake >= 2.6.2 @@ -47,35 +45,35 @@ BuildRequires: gettext-devel %{?with_gtk:BuildRequires: gtk+2-devel >= 1:2.6.0} BuildRequires: jack-audio-connection-kit-devel -BuildRequires: js-devel(threads) +#BuildRequires: js-devel(threads) BuildRequires: lame-libs-devel #BuildRequires: libdca-devel -BuildRequires: libdts-devel -BuildRequires: libmad-devel -BuildRequires: libmpeg3-devel +#BuildRequires: libdts-devel +#BuildRequires: libmad-devel +#BuildRequires: libmpeg3-devel BuildRequires: libpng-devel BuildRequires: libsamplerate-devel BuildRequires: libstdc++-devel -BuildRequires: libtool BuildRequires: libvorbis-devel -#BuildRequires: libx264-devel +BuildRequires: libx264-devel BuildRequires: libxml2-devel %{?with_qt4:BuildRequires: libxslt-progs} +%ifarch %{ix86} BuildRequires: nasm >= 0.98.32 +%endif %{?with_amr:BuildRequires: opencore-amr-devel} BuildRequires: pkgconfig BuildRequires: pulseaudio-devel -%{?with_qt4:BuildRequires: qt-linguist} %{?with_qt4:BuildRequires: qt4-build >= %{qt4_version}} +%{?with_qt4:BuildRequires: qt4-linguist} %{?with_qt4:BuildRequires: qt4-qmake >= %{qt4_version}} 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: xvidcore-devel BuildRequires: zlib-devel -Requires: js(threads) +#Requires: js(threads) BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -114,9 +112,12 @@ %build TOP=$PWD + # main install -d build/%{_lib} plugins/build cd build + +export QTDIR=%{_libdir}/qt4 %cmake \ -DCMAKE_BUILD_TYPE=%{?debug:Debug}%{!?debug:Release} \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \ @@ -388,6 +389,13 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.83 2010/02/03 12:49:03 sparky +- readded BR: libx264-devel; todo dropped +- fixed lrelease detection, BR: qt4-linguist +- droped unused BR: libtool, xorg-lib-libXt-devel +- commented out unused BR: a52dec-libs-devel, js-devel(threads), libdts-devel, + libmad-devel, libmpeg3-devel -- some may be wrong, please revise + Revision 1.82 2010/02/03 09:15:20 glen - up to 2.5.2, some libdir fixes upstream, bunch of new files ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/avidemux/avidemux.spec?r1=1.82&r2=1.83&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
