Projects
Multimedia
avidemux3
Sign Up
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 10
View file
avidemux3.changes
Changed
@@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Oct 17 2014 - joerg.lorenzen@ki.tng.de +- changed BuildRequires to pkgconfig where possible +- enable build for SLES, unfortunately without frontends qt and gtk + because SLES doesn't provide gtk3 and qt >= 4.7 + +------------------------------------------------------------------- Fri Oct 10 2014 - joerg.lorenzen@ki.tng.de - update internal ffmpeg to version 1.2.9
View file
avidemux3.spec
Changed
@@ -27,11 +27,13 @@ Source1: avidemux3-qt4.desktop Source2: avidemux3-gtk.desktop Source3: ffmpeg-%{ffmpeg_version}.tar.bz2 -Source4: xvba_support_from_xbmc_xvba.patch +Source4: config.mak.diff +Source5: xvba_support_from_xbmc_xvba.patch Patch0: avidemux-cmake-2.8.8.patch Patch1: avidemux-linking.patch Patch2: avidemux-x264_plugins.patch Patch3: avidemux-package_version.patch +Patch4: avidemux-bootStrap.patch License: GPL-2.0 Group: Productivity/Multimedia/Video/Editors and Convertors @@ -39,71 +41,99 @@ BuildRequires: cmake BuildRequires: gettext-tools BuildRequires: intltool -BuildRequires: libxslt-devel BuildRequires: desktop-file-utils BuildRequires: pkg-config -BuildRequires: sqlite-devel BuildRequires: fdupes BuildRequires: dos2unix +BuildRequires: pkgconfig(libxslt) +%if 0%{?sles_version} +BuildRequires: sqlite-devel +%else +BuildRequires: pkgconfig(sqlite3) +%endif # Libraries BuildRequires: yasm-devel -BuildRequires: libxml2-devel >= 2.6.8 -BuildRequires: fontconfig-devel +BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(fontconfig) +BuildRequires: pkgconfig(freetype2) %if 0%{?suse_version} > 1140 -BuildRequires: freetype-devel -BuildRequires: js-devel +BuildRequires: pkgconfig(mozjs185) %else -BuildRequires: freetype2-devel +%if 0%{?sles_version} BuildRequires: mozilla-xulrunner192-devel +%else +BuildRequires: pkgconfig(mozilla-js) >= 2.0 +%endif %endif BuildRequires: pkgconfig(xv) BuildRequires: pkgconfig(xmu) -BuildRequires: libsamplerate-devel -BuildRequires: jack-audio-connection-kit-devel -BuildRequires: libass-devel +BuildRequires: pkgconfig(samplerate) +BuildRequires: pkgconfig(jack) +BuildRequires: pkgconfig(libass) # Sound out -BuildRequires: alsa-devel -BuildRequires: libpulse-devel BuildRequires: arts-devel +BuildRequires: pkgconfig(alsa) +BuildRequires: pkgconfig(libpulse) +%if 0%{?sles_version} BuildRequires: libesd-devel +%else +BuildRequires: pkgconfig(esound) +%endif # Video out -BuildRequires: SDL-devel >= 1.2.7 +BuildRequires: pkgconfig(sdl) BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(glu) -BuildRequires: libvdpau-devel +BuildRequires: pkgconfig(vdpau) ## newer version of libav are not compatible to avidemux %if 0%{?suse_version} < 1310 -BuildRequires: libva-devel +BuildRequires: pkgconfig(libva) %endif # Audio Codecs -BuildRequires: liba52-devel BuildRequires: libfaac-devel BuildRequires: libfaad-devel BuildRequires: libmp3lame-devel +BuildRequires: libaften-devel +%if 0%{?sles_version} +BuildRequires: liba52-devel BuildRequires: libmad-devel -BuildRequires: libogg-devel BuildRequires: libvorbis-devel BuildRequires: libdca-devel BuildRequires: libopencore-amr-devel BuildRequires: libvpx-devel BuildRequires: libtwolame-devel -BuildRequires: libaften-devel BuildRequires: libdcaenc-devel +%else +BuildRequires: pkgconfig(liba52) +BuildRequires: pkgconfig(mad) +BuildRequires: pkgconfig(vorbis) +BuildRequires: pkgconfig(libdca) +BuildRequires: pkgconfig(opencore-amrnb) +BuildRequires: pkgconfig(vpx) +BuildRequires: pkgconfig(twolame) +BuildRequires: pkgconfig(dcaenc) +%endif +BuildRequires: pkgconfig(ogg) # Video Codecs BuildRequires: libxvidcore-devel +%if 0%{?sles_version} BuildRequires: libx264-devel +%else +BuildRequires: pkgconfig(x264) +%endif +%if ! 0%{?sles_version} # QT4-GUI -BuildRequires: libqt4-devel +BuildRequires: pkgconfig(QtCore) >= 4.7 # GTK-GUI -BuildRequires: gtk3-devel -BuildRequires: cairo-devel +BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(cairo) +%endif # Main package requires at least one frontend (cli, gtk or qt4) Requires: avidemux3-frontend = %{version}-%{release} @@ -139,6 +169,7 @@ This package provides a command-line interface to editing videos with avidemux. +%if ! 0%{?sles_version} %package gtk Summary: GTK interface for avidemux Group: Productivity/Multimedia/Video/Editors and Convertors @@ -180,6 +211,8 @@ This package contains the Qt graphical interface for avidemux. +%lang_package -n avidemux3-qt4 + %package help Summary: Help files for avidemux Group: Productivity/Multimedia/Video/Editors and Convertors @@ -198,38 +231,59 @@ This package contains the help files for avidemux. -%lang_package -n avidemux3-qt4 +%endif %prep %setup -q -n avidemux_%{version} +%if 0%{?sles_version} +echo '# This line is mandatory to access the configuration functions' > %{_sourcedir}/avidemux3-rpmlintrc +echo '' >> %{_sourcedir}/avidemux3-rpmlintrc +echo 'from Config import *' >> %{_sourcedir}/avidemux3-rpmlintrc +echo 'addFilter("libdir-macro-in-noarch-package")' >> %{_sourcedir}/avidemux3-rpmlintrc +%endif find . -type f -exec dos2unix -q {} \; sed -i -e 's|set(FFMPEG_VERSION "1.2.1")|set(FFMPEG_VERSION "%{ffmpeg_version}")|g' cmake/admFFmpegBuild.cmake rm -f avidemux_core/ffmpeg_package/ffmpeg-1.2.1.tar.bz2 cp %{S:3} avidemux_core/ffmpeg_package/ -pushd avidemux_core/ffmpeg_package/patches/xvba -rm -f xvba_support_from_xbmc_xvba.patch +pushd avidemux_core/ffmpeg_package/patches +rm -f config.mak.diff cp %{S:4} . +pushd xvba +rm -f xvba_support_from_xbmc_xvba.patch +cp %{S:5} . +popd popd %patch0 -p0 %patch1 -p0 %patch2 -p0 %patch3 -p0 +%patch4 -p0 %build +%if ! 0%{?sles_version} export CXXFLAGS="%optflags -fno-strict-aliasing" +%else +export CXXFLAGS="%optflags -D__STDC_CONSTANT_MACROS -fno-strict-aliasing" +%endif chmod 755 bootStrap.bash +%if ! 0%{?sles_version} ./bootStrap.bash --with-cli --with-gtk +%else +./bootStrap.bash --with-cli --without-qt4 +%endif %install cp -r install/* %{buildroot} +%if ! 0%{?sles_version} # Install desktop files install -D -m644 %{S:1} %{buildroot}%{_datadir}/applications/avidemux3-qt4.desktop install -D -m644 %{S:2} %{buildroot}%{_datadir}/applications/avidemux3-gtk.desktop # Install icon install -D -m644 avidemux_icon.png %{buildroot}%{_datadir}/pixmaps/avidemux3.png +%endif # Install man install -D -m644 man/avidemux.1 %{buildroot}%{_mandir}/man1/avidemux.1 @@ -247,6 +301,7 @@ %postun cli -p /sbin/ldconfig +%if ! 0%{?sles_version} %post gtk -p /sbin/ldconfig %postun gtk -p /sbin/ldconfig @@ -254,6 +309,7 @@ %post qt4 -p /sbin/ldconfig %postun qt4 -p /sbin/ldconfig +%endif %files %defattr(-,root,root) @@ -363,7 +419,9 @@ %{_libdir}/ADM_plugins6/pluginSettings/x264/3/veryFast.json %{_libdir}/ADM_plugins6/pluginSettings/x264/3/fast.json %{_libdir}/ADM_plugins6/pluginSettings/x264/3/iPhone.json +%if ! 0%{?sles_version} %{_libdir}/ADM_plugins6/scriptEngines/libADM_script_qt.so +%endif %{_libdir}/ADM_plugins6/scriptEngines/libADM_script_spiderMonkey.so %{_libdir}/ADM_plugins6/scriptEngines/libADM_script_tinyPy.so %{_libdir}/ADM_plugins6/videoDecoders/libADM_vd_vpx.so @@ -405,6 +463,9 @@ %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_removePlane.so %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_resampleFps.so %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_rotate.so +%if 0%{?sles_version} +%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_ssa.so +%endif %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_separateField.so %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_sharpen.so %if 0%{?suse_version} > 1210 @@ -420,9 +481,11 @@ %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_yadif.so %dir %{_datadir}/ADM6_addons %dir %{_datadir}/ADM6_addons/avsfilter +%if ! 0%{?sles_version} %{_datadir}/ADM6_addons/avsfilter/avsload.exe %{_datadir}/ADM6_addons/avsfilter/pipe_source.dll %{_datadir}/pixmaps/avidemux3.png +%endif %{_mandir}/man1/avidemux.1.gz %doc AUTHORS COPYING README @@ -440,6 +503,7 @@ %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_mpdelogoCli.so %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_swscaleResize_cli.so +%if ! 0%{?sles_version} %files gtk %defattr(-,root,root) %{_bindir}/avidemux3_gtk @@ -521,13 +585,14 @@ %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_swscaleResize_qt4.so %{_datadir}/applications/avidemux3-qt4.desktop +%files -n avidemux3-qt4-lang +%defattr(-,root,root) +%{_datadir}/avidemux3/i18n/ + %files help %defattr(-,root,root) %dir %{_datadir}/avidemux3 %{_datadir}/avidemux3/help/ - -%files -n avidemux3-qt4-lang -%defattr(-,root,root) -%{_datadir}/avidemux3/i18n/ +%endif %changelog
View file
avidemux-bootStrap.patch
Added
@@ -0,0 +1,10 @@ +--- bootStrap.bash.orig 2014-03-12 07:15:23.000000000 +0100 ++++ bootStrap.bash 2014-10-16 13:17:27.202466100 +0200 +@@ -12,6 +12,7 @@ + export O_PARAL="-j 2" + fail() + { ++ cat /tmp/log$BUILDDIR + echo "** Failed at $1**" + exit 1 + }
View file
config.mak.diff
Added
@@ -0,0 +1,11 @@ +--- config.mak.orig 2014-10-14 00:23:55.903217057 +0200 ++++ config.mak 2014-10-14 00:23:55.919216855 +0200 +@@ -94,7 +94,7 @@ + EXEOBJS= + INSTALL=install + LIBTARGET= +-SLIBNAME=$(SLIBPREF)$(FULLNAME)$(SLIBSUF) ++SLIBNAME=$(SLIBPREF)ADM6$(FULLNAME)$(SLIBSUF) + SLIBNAME_WITH_VERSION=$(SLIBNAME).$(LIBVERSION) + SLIBNAME_WITH_MAJOR=$(SLIBNAME).$(LIBMAJOR) + SLIB_CREATE_DEF_CMD=
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.