Packman Build Service PMBS

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 26

LiVES.changes Changed

LiVES.spec Changed

@@ -1,5 +1,7 @@
-# vim: set ts=4 sw=4 et:
-
+#
+# spec file for package LiVES
+#
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2010-2012 Pascal Bleser <pascal.bleser@opensuse.org>
 # Copyright (c) 2007-2010 Andrea Florio <andrea@links2linux.de>
 #
@@ -13,51 +15,70 @@
 # published by the Open Source Initiative.
 
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
 
+%define soname  0
 Name:           LiVES
-Version:        2.2.8
-%define         soname 0
-Release:        1
+Version:        2.4.1
+Release:        0
 Summary:        Video Editor and VJ Tool
 License:        GPL-2.0+
 Group:          Productivity/Multimedia/Video/Editors and Convertors
-Source0:        http://www.xs4all.nl/%7Esalsaman/lives/current/LiVES-%{version}.tar.bz2
+Url:            http://lives.sourceforge.net
+Source0:        http://lives-video.com/releases/%{name}-%{version}.tar.bz2
 Source99:       LiVES-rpmlintrc
 Patch0:         LiVES-redefinition_of_typedef.patch
-Url:            http://lives.sourceforge.net
-BuildRoot:      %{_tmppath}/%{name}-%{version}-root
-
-BuildRequires:  freetype2-devel SDL-devel pango-devel 
-BuildRequires:  libffmpeg-devel frei0r-plugins-devel update-desktop-files
-BuildRequires:  libaal-devel
-BuildRequires:  libavc1394-devel >= 0.5.3
+BuildRequires:  autoconf
+BuildRequires:  automake
+BuildRequires:  bison
 BuildRequires:  gcc-c++
-BuildRequires:  automake autoconf libtool
-BuildRequires:  perl bison libvisual libvisual-devel slang-devel atk-devel
+BuildRequires:  perl
 BuildRequires:  ImageMagick
+BuildRequires:  ladspa-devel
+BuildRequires:  libGLee-devel
+BuildRequires:  libaal-devel
+BuildRequires:  libtool
+BuildRequires:  libvisual
+BuildRequires:  libvisual-devel
+BuildRequires:  pkgconfig(alsa)
+BuildRequires:  pkgconfig(atk)
+BuildRequires:  pkgconfig(dirac)
+BuildRequires:  pkgconfig(freetype2)
+BuildRequires:  pkgconfig(frei0r)
+BuildRequires:  pkgconfig(jack)
+BuildRequires:  pkgconfig(libavc1394) >= 0.5.3
+BuildRequires:  pkgconfig(libavcodec)
+BuildRequires:  pkgconfig(libavformat)
+BuildRequires:  pkgconfig(libavutil)
+BuildRequires:  pkgconfig(libdv)
+BuildRequires:  pkgconfig(liboil-0.3)
+BuildRequires:  pkgconfig(libpulse)
+BuildRequires:  pkgconfig(libswscale)
+BuildRequires:  pkgconfig(libv4l1)
 BuildRequires:  pkgconfig(mjpegtools) >= 1.6.2
-BuildRequires:  alsa-devel
-BuildRequires:  liboil-devel
-BuildRequires:  libogg-devel libvorbis-devel
-BuildRequires:  libtheora-devel
-BuildRequires:  libdv-devel
-BuildRequires:  schroedinger-devel
-BuildRequires:  dirac-devel
-BuildRequires:  libpulse-devel
+BuildRequires:  pkgconfig(ogg)
+BuildRequires:  pkgconfig(pango)
+BuildRequires:  pkgconfig(schroedinger-1.0)
+BuildRequires:  pkgconfig(sdl)
+BuildRequires:  pkgconfig(slang)
+BuildRequires:  pkgconfig(theora)
+BuildRequires:  pkgconfig(vorbis)
+BuildRequires:  update-desktop-files
+Requires:       MPlayer
+Requires:       cdrkit-cdrtools-compat
+Requires:       dvgrab
+Requires:       ladspa
+Requires:       libvisual-plugins
+Requires:       libweed%{soname} = %{version}
+Requires:       sox
+Provides:       lives
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?suse_version} >= 1230
-BuildRequires:  gtk3-devel
+BuildRequires:  pkgconfig(gtk+-3.0)
 %else
 BuildRequires:  gtk2-devel
 %endif
-BuildRequires:  libv4l-devel
-BuildRequires:  sox MPlayer cdrkit-cdrtools-compat dvgrab
-BuildRequires:  jack-devel
-BuildRequires:  libGLee-devel
-BuildRequires:  ladspa-devel
-Requires:       libvisual-plugins
-Requires:       ladspa
-Requires:       sox MPlayer cdrkit-cdrtools-compat dvgrab
-Requires:       libweed%{soname} = %{version}
 %if 0%{?suse_version} < 1200
 BuildRequires:  xmms2
 Requires:       xmms2
@@ -68,7 +89,7 @@
 content, the video editor who wants to produce professional looking video, and
 the VJ who wants to captivate with spectacular images.
 
-%package -n libweed%{soname}
+%package -n     libweed%{soname}
 Summary:        Libweed library
 Group:          Development/Libraries/C and C++
 
@@ -77,7 +98,7 @@
 content, the video editor who wants to produce professional looking video, and
 the VJ who wants to captivate with spectacular images.
 
-%package -n libweed-devel
+%package -n     libweed-devel
 Summary:        Libweed devel package
 Group:          Development/Libraries/C and C++
 Requires:       libweed%{soname} = %{version}
@@ -87,22 +108,51 @@
 content, the video editor who wants to produce professional looking video, and
 the VJ who wants to captivate with spectacular images.
 
+This package contains header files and libraries needed to develop
+application that use libweed.
+
+%package -n     libOSC%{soname}
+Summary:        Libweed library
+Group:          Development/Libraries/C and C++
+
+%description -n libOSC%{soname}
+LiVES is aimed at the digital video artist who wants to create their own
+content, the video editor who wants to produce professional looking video, and
+the VJ who wants to captivate with spectacular images.
+
+This is NOT the full libOSC SDK, it is a highly hacked version for testing 
+with LiVES.
+
+Use of this hacked package is not recommended.
+
+%package -n     libOSC-devel
+Summary:        Libweed devel package
+Group:          Development/Libraries/C and C++
+Requires:       libOSC%{soname} = %{version}
+
+%description -n libOSC-devel
+LiVES is aimed at the digital video artist who wants to create their own
+content, the video editor who wants to produce professional looking video, and
+the VJ who wants to captivate with spectacular images.
+
+This package contains header files and libraries needed to develop
+application that use libOSC.
+
 %prep
 %setup -q -n lives-%{version}
-%patch0 -p0
+#%patch0 -p1
 
 # fix wrong EOL
-%__sed -i 's/\r$//' weed-docs/*.txt
+sed -i 's/\r$//' weed-docs/*.txt
 
-find . -type d -name .svn | while read d; do %__rm -rf "$d"; done
+find . -type d -name .svn | while read d; do rm -rf "$d"; done
 
 pushd libweed
-%__ln_s . weed
+ln -s . weed
 popd #libweed
 
 %build
 
-
 export CFLAGS="%{optflags} -fno-strict-aliasing -I$PWD/libweed/"
 export CPPFLAGS="$CFLAGS"
 export CXXFLAGS="$CFLAGS"
@@ -110,41 +160,44 @@
     --libdir="%{_libdir}" \
     --disable-doxygen
 
-make %{?jobs:-j%{jobs}}
+make %{?_smp_mflags}
 
 %install
-%makeinstall
-%__rm -f "%{buildroot}%{_libdir}"/*.la
+make DESTDIR=%{buildroot} install
 
-%__mv "%{buildroot}%{_datadir}/app-install/icons/lives.png" \

LiVES-2.2.8.tar.bz2 -> LiVES-2.4.1.tar.bz2 Changed