Hello community,
here is the log from the commit of package smilutils for openSUSE:Factory
checked in at Thu Feb 4 11:55:51 CET 2010.
--------
--- smilutils/smilutils.changes 2009-08-26 14:04:49.000000000 +0200
+++ /mounts/work_src_done/STABLE/smilutils/smilutils.changes 2010-01-18 01:17:06.000000000 +0100
@@ -1,0 +2,29 @@
+Mon Jan 18 00:56:46 CET 2010 - vuntz@opensuse.org
+
+- Update to a cvs checkout from 20070731, that is used by Debian
+ and Mandriva: this lets us remove a patch and the dependency on
+ gdk-pixbuf 1.x.
+- Changes since 0.3.0:
+ + update playlist code in libkino
+ + add option for progress display to smil2raw
+ + fix parsing SMIL time values in locales which do not use period
+ as decimal point
+ + fix compilation against recent version of ffmpeg
+- Call autogen.sh instead of autoreconf, since this is cvs checkout
+ with no generated configure script.
+- Remove imlib-config, imlib-devel, imlib2-devel BuildRequires and
+ do not add possibility to use --with-imlib configure flag: imlib
+ support has been removed.
+- Change gdk-pixbuf-devel BuildRequires to gtk2-devel: the code has
+ been ported.
+- Add libquicktime-devel BuildRequires.
+- Update abuild.diff: since we call autogen.sh anyway, do not
+ provide Makefile.in parts in the patch.
+- Replace smilutils-includes.patch with smilutils-gcc4.3.patch,
+ that is now shared with Debian and Mandriva.
+- Add smilutils-gcc4.4.patch to fix build with gcc 4.4. Thanks
+ Mandriva!
+- Drop kino-1.1.0-playlistsupport.diff: fixed upstream.
+- Use makeinstall macro.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
kino-1.1.0-playlistsupport.diff
smilutils-0.3.0.tar.bz2
smilutils-includes.diff
New:
----
smilutils-0.3.2+cvs20070731.tar.bz2
smilutils-gcc4.3.patch
smilutils-gcc4.4.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ smilutils.spec ++++++
--- /var/tmp/diff_new_pack.8ai7hk/_old 2010-02-04 11:55:35.000000000 +0100
+++ /var/tmp/diff_new_pack.8ai7hk/_new 2010-02-04 11:55:35.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package smilutils (Version 0.3.0)
+# spec file for package smilutils (Version 0.3.2+cvs20070731)
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,23 +19,19 @@
Name: smilutils
-BuildRequires: SDL-devel gcc-c++ gdk-pixbuf-devel libdv-devel libxml2-devel
-%define imlib_ver 2
-%if %{imlib_ver} == 1
-BuildRequires: imlib-config imlib-devel
-%else
-BuildRequires: imlib2-devel
-%endif
+BuildRequires: SDL-devel gcc-c++ gtk2-devel libdv-devel libquicktime-devel libxml2-devel
Summary: Tools for converting and editing digital video (DV) data
-Version: 0.3.0
-Release: 169
-License: GPL v2 or later
+Version: 0.3.2+cvs20070731
+Release: 1
+License: GPLv2+
Group: Productivity/Multimedia/Video/Editors and Convertors
AutoReqProv: on
-Source0: smilutils-0.3.0.tar.bz2
+Source0: %{name}-%{version}.tar.bz2
Patch0: abuild.diff
-Patch1: kino-1.1.0-playlistsupport.diff
-Patch2: smilutils-includes.diff
+# PATCH-FIX-UPSTREAM smilutils-gcc4.3.patch vuntz@opensuse.org -- Taken from Debian and Mandriva, fix build with gcc 4.3
+Patch1: smilutils-gcc4.3.patch
+# PATCH-FIX-UPSTREAM smilutils-gcc4.4.patch vuntz@opensuse.org -- Taken from Mandriva, fix build with gcc 4.4
+Patch2: smilutils-gcc4.4.patch
Url: http://www.kinodv.org/article/view/70/1/7
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Provides: image2raw ppm2raw ppmeffectv ppmfilter raw2dv raw2image raw2webcam raw2yuv rawmultiply rawplay smil2raw smil2wav smil2yuv tga2raw xwd2raw
@@ -55,23 +51,19 @@
Charles Yates
%prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}
%patch0 -p1
%patch1 -p1
-%patch2
+%patch2 -p1
%build
-autoreconf -fiv
-%if %{imlib_ver} == 1
-%configure --disable-static --with-pic --with-imlib
-%else
-export CXXFLAGS="$RPM_OPT_FLAGS -fpermissive"
+./autogen.sh
+###export CXXFLAGS="$RPM_OPT_FLAGS -fpermissive"
%configure --disable-static --with-pic
-%endif
make %{?jobs:-j%jobs}
%install
-make install DESTDIR=$RPM_BUILD_ROOT
+%makeinstall
# Think about removing '.la' files, it said. Thought about it. Did it.
find $RPM_BUILD_ROOT/%{_libdir} -name \*.la | xargs rm -fv
++++++ abuild.diff ++++++
--- /var/tmp/diff_new_pack.8ai7hk/_old 2010-02-04 11:55:35.000000000 +0100
+++ /var/tmp/diff_new_pack.8ai7hk/_new 2010-02-04 11:55:35.000000000 +0100
@@ -9,17 +9,6 @@
libkinoextensions_la_SOURCES = \
Threader.h \
---- smilutils-0.3.0/extensions/Makefile.in
-+++ smilutils-0.3.0/extensions/Makefile.in
-@@ -65,7 +65,7 @@
- OBJEXT = @OBJEXT@
- PATH_SEPARATOR = @PATH_SEPARATOR@
-
--libdir = $(prefix)/lib/kino
-+libdir = @libdir@/kino
- AMTAR = @AMTAR@
- AS = @AS@
- AVCODEC_CFLAGS = @AVCODEC_CFLAGS@
--- smilutils-0.3.0/libkino/Makefile.am
+++ smilutils-0.3.0/libkino/Makefile.am
@@ -2,7 +2,7 @@
@@ -31,14 +20,3 @@
libkinolegacy_la_SOURCES = \
avi.cc avi.h \
---- smilutils-0.3.0/libkino/Makefile.in
-+++ smilutils-0.3.0/libkino/Makefile.in
-@@ -65,7 +65,7 @@
- OBJEXT = @OBJEXT@
- PATH_SEPARATOR = @PATH_SEPARATOR@
-
--libdir = $(prefix)/lib/kino
-+libdir = @libdir@/kino
- AMTAR = @AMTAR@
- AS = @AS@
- AVCODEC_CFLAGS = @AVCODEC_CFLAGS@
++++++ smilutils-gcc4.3.patch ++++++
--- smilutils-0.3.2+cvs20070731.orig/extensions/DVEncoder.cc
+++ smilutils-0.3.2+cvs20070731/extensions/DVEncoder.cc
@@ -17,6 +17,7 @@
* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <cstring>
#include <algorithm>
#include <iostream>
using std::cerr;
--- smilutils-0.3.2+cvs20070731.orig/extensions/PixbufUtils.cc
+++ smilutils-0.3.2+cvs20070731/extensions/PixbufUtils.cc
@@ -1,6 +1,7 @@
#include
#include <string>
+#include <cstring>
using std::string;
#include "PixbufUtils.h"
--- smilutils-0.3.2+cvs20070731.orig/extensions/PPMPump.cc
+++ smilutils-0.3.2+cvs20070731/extensions/PPMPump.cc
@@ -17,6 +17,8 @@
* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <cstring>
+
#include "config.h"
#include
#include
--- smilutils-0.3.2+cvs20070731.orig/libkino/frame.cc
+++ smilutils-0.3.2+cvs20070731/libkino/frame.cc
@@ -32,6 +32,7 @@
// C++ includes
#include <string>
+#include <cstring>
#include <iostream>
#include <strstream>
#include <iomanip>
--- smilutils-0.3.2+cvs20070731.orig/libkino/playlist.cc
+++ smilutils-0.3.2+cvs20070731/libkino/playlist.cc
@@ -26,6 +26,7 @@
#include <fstream>
#include <sstream>
#include <string>
+#include <cstring>
#include <list>
#include <map>
--- smilutils-0.3.2+cvs20070731.orig/libkino/avi.cc
+++ smilutils-0.3.2+cvs20070731/libkino/avi.cc
@@ -120,6 +120,7 @@
// C++ includes
#include <string>
+#include <cstring>
#include <iostream>
#include <iomanip>
#include <cassert>
--- smilutils-0.3.2+cvs20070731.orig/libkino/filehandler.cc
+++ smilutils-0.3.2+cvs20070731/libkino/filehandler.cc
@@ -22,6 +22,7 @@
#endif
#include <string>
+#include <cstring>
#include <iostream>
#include <strstream>
#include <iomanip>
--- smilutils-0.3.2+cvs20070731.orig/apps/raw2dv/Makefile.am
+++ smilutils-0.3.2+cvs20070731/apps/raw2dv/Makefile.am
@@ -9,7 +9,7 @@
raw2dv_SOURCES = raw2dv.cc
AM_CXXFLAGS = -I../../extensions -I../../libkino \
- -s -Wall $(GNOME_INCLUDEDIR) $(XML2_FLAGS) \
+ -Wall $(GNOME_INCLUDEDIR) $(XML2_FLAGS) \
-D_FILE_OFFSET_BITS=64 \
$(PIXBUF_FLAGS) $(LIBQUICKTIME_CFLAGS)
--- smilutils-0.3.2+cvs20070731.orig/apps/raw2dv/raw2dv.cc
+++ smilutils-0.3.2+cvs20070731/apps/raw2dv/raw2dv.cc
@@ -21,6 +21,7 @@
#include <iostream>
#include <string>
+#include <cstring>
#include <cmath>
using std::string;
using std::cerr;
--- smilutils-0.3.2+cvs20070731.orig/apps/rawplay/Makefile.am
+++ smilutils-0.3.2+cvs20070731/apps/rawplay/Makefile.am
@@ -8,7 +8,7 @@
AM_CXXFLAGS = -I../../extensions -I../../libkino \
`sdl-config --cflags` $(X_CFLAGS) \
- -s -Wall $(GNOME_INCLUDEDIR) $(XML2_FLAGS) \
+ -Wall $(GNOME_INCLUDEDIR) $(XML2_FLAGS) \
-D_FILE_OFFSET_BITS=64 \
$(PIXBUF_FLAGS)
--- smilutils-0.3.2+cvs20070731.orig/apps/ppm2webcam/ppm2webcam.cc
+++ smilutils-0.3.2+cvs20070731/apps/ppm2webcam/ppm2webcam.cc
@@ -24,6 +24,7 @@
#include <iostream>
#include <string>
+#include <cstring>
#include <cmath>
using std::string;
using std::cerr;
--- smilutils-0.3.2+cvs20070731.orig/apps/ppm2webcam/Makefile.am
+++ smilutils-0.3.2+cvs20070731/apps/ppm2webcam/Makefile.am
@@ -9,7 +9,7 @@
ppm2webcam_SOURCES = ppm2webcam.cc
AM_CXXFLAGS = -I../../extensions -I../../libkino \
- -s -Wall $(GNOME_INCLUDEDIR) $(XML2_FLAGS) \
+ -Wall $(GNOME_INCLUDEDIR) $(XML2_FLAGS) \
-D_FILE_OFFSET_BITS=64 \
$(PIXBUF_FLAGS)
--- smilutils-0.3.2+cvs20070731.orig/apps/smil2raw/smil2raw.cc
+++ smilutils-0.3.2+cvs20070731/apps/smil2raw/smil2raw.cc
@@ -17,6 +17,8 @@
* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <cstring>
+
#include
#include <iostream>
#include
--- smilutils-0.3.2+cvs20070731.orig/apps/ppmfilter/ppmfilter.cc
+++ smilutils-0.3.2+cvs20070731/apps/ppmfilter/ppmfilter.cc
@@ -26,6 +26,7 @@
#include <iostream>
#include <string>
+#include <cstring>
#include <vector>
#include <queue>
#include <stack>
--- smilutils-0.3.2+cvs20070731.orig/apps/ffmpeg2raw/Makefile.am
+++ smilutils-0.3.2+cvs20070731/apps/ffmpeg2raw/Makefile.am
@@ -6,7 +6,7 @@
ffmpeg2raw_SOURCES = ffmpeg2raw.c dvutils.c dvutils.h
-AM_CFLAGS = -O3 -s -Wall \
+AM_CFLAGS = -O3 -Wall \
-I$(FFMPEG_PATH) -I$(FFMPEG_PATH)/libavcodec -I$(FFMPEG_PATH)/libavformat \
-D_FILE_OFFSET_BITS=64
--- smilutils-0.3.2+cvs20070731.orig/apps/rawmultiply/Makefile.am
+++ smilutils-0.3.2+cvs20070731/apps/rawmultiply/Makefile.am
@@ -9,7 +9,7 @@
rawmultiply_SOURCES = rawmultiply.cc
AM_CXXFLAGS = -I../../extensions -I../../libkino \
- -s -Wall $(GNOME_INCLUDEDIR) $(XML2_FLAGS) \
+ -Wall $(GNOME_INCLUDEDIR) $(XML2_FLAGS) \
-D_FILE_OFFSET_BITS=64 \
$(PIXBUF_FLAGS)
--- smilutils-0.3.2+cvs20070731.orig/apps/rawmultiply/rawmultiply.cc
+++ smilutils-0.3.2+cvs20070731/apps/rawmultiply/rawmultiply.cc
@@ -21,6 +21,7 @@
#include <iostream>
#include <string>
+#include <cstring>
#include <cmath>
using std::string;
using std::cerr;
--- smilutils-0.3.2+cvs20070731.orig/apps/image2raw/image2raw.cc
+++ smilutils-0.3.2+cvs20070731/apps/image2raw/image2raw.cc
@@ -21,6 +21,7 @@
#include <iostream>
#include <string>
+#include <cstring>
using std::cerr;
using std::endl;
using std::string;
--- smilutils-0.3.2+cvs20070731.orig/apps/image2raw/Makefile.am
+++ smilutils-0.3.2+cvs20070731/apps/image2raw/Makefile.am
@@ -9,7 +9,7 @@
image2raw_SOURCES = image2raw.cc
AM_CXXFLAGS = -I../../extensions -I../../libkino \
- -s -Wall $(GNOME_INCLUDEDIR) $(XML2_FLAGS) \
+ -Wall $(GNOME_INCLUDEDIR) $(XML2_FLAGS) \
-D_FILE_OFFSET_BITS=64 \
$(PIXBUF_FLAGS)
--- smilutils-0.3.2+cvs20070731.orig/apps/xwd2raw/Makefile.am
+++ smilutils-0.3.2+cvs20070731/apps/xwd2raw/Makefile.am
@@ -8,7 +8,7 @@
xwd2raw_SOURCES = xwd2raw.cc
-AM_CXXFLAGS = -s -Wall $(GNOME_INCLUDEDIR) $(XML2_FLAGS) \
+AM_CXXFLAGS = -Wall $(GNOME_INCLUDEDIR) $(XML2_FLAGS) \
-D_FILE_OFFSET_BITS=64 \
$(PIXBUF_FLAGS)
--- smilutils-0.3.2+cvs20070731.orig/apps/smil2wav/smil2wav.cc
+++ smilutils-0.3.2+cvs20070731/apps/smil2wav/smil2wav.cc
@@ -17,6 +17,8 @@
* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <cstring>
+
#include
#include <iostream>
#include
--- smilutils-0.3.2+cvs20070731.orig/apps/raw2image/raw2image.cc
+++ smilutils-0.3.2+cvs20070731/apps/raw2image/raw2image.cc
@@ -23,6 +23,7 @@
#include <iostream>
#include <string>
+#include <cstring>
#include <cmath>
using std::string;
using std::cout;
--- smilutils-0.3.2+cvs20070731.orig/apps/raw2image/Makefile.am
+++ smilutils-0.3.2+cvs20070731/apps/raw2image/Makefile.am
@@ -9,7 +9,7 @@
raw2image_SOURCES = raw2image.cc
AM_CXXFLAGS = -I../../extensions -I../../libkino \
- -s -Wall $(GNOME_INCLUDEDIR) $(XML2_FLAGS) \
+ -Wall $(GNOME_INCLUDEDIR) $(XML2_FLAGS) \
-D_FILE_OFFSET_BITS=64 \
$(PIXBUF_FLAGS)
--- smilutils-0.3.2+cvs20070731.orig/apps/raw2webcam/Makefile.am
+++ smilutils-0.3.2+cvs20070731/apps/raw2webcam/Makefile.am
@@ -9,7 +9,7 @@
raw2webcam_SOURCES = raw2webcam.cc
AM_CXXFLAGS = -I../../extensions -I../../libkino \
- -s -Wall $(GNOME_INCLUDEDIR) $(XML2_FLAGS) \
+ -Wall $(GNOME_INCLUDEDIR) $(XML2_FLAGS) \
-D_FILE_OFFSET_BITS=64 \
$(PIXBUF_FLAGS)
--- smilutils-0.3.2+cvs20070731.orig/apps/raw2webcam/raw2webcam.cc
+++ smilutils-0.3.2+cvs20070731/apps/raw2webcam/raw2webcam.cc
@@ -23,6 +23,7 @@
#include <iostream>
#include <string>
+#include <cstring>
#include <cmath>
using std::string;
using std::cerr;
--- smilutils-0.3.2+cvs20070731.orig/apps/smil2yuv/smil2yuv.cc
+++ smilutils-0.3.2+cvs20070731/apps/smil2yuv/smil2yuv.cc
@@ -17,6 +17,7 @@
* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <cstring>
#include
#include <iostream>
using std::cerr;
--- smilutils-0.3.2+cvs20070731.orig/apps/ppm2raw/ppm2raw.cc
+++ smilutils-0.3.2+cvs20070731/apps/ppm2raw/ppm2raw.cc
@@ -23,6 +23,7 @@
#include <iostream>
#include <string>
+#include <cstring>
#include <cmath>
using std::string;
using std::cerr;
--- smilutils-0.3.2+cvs20070731.orig/apps/ppm2raw/Makefile.am
+++ smilutils-0.3.2+cvs20070731/apps/ppm2raw/Makefile.am
@@ -9,7 +9,7 @@
ppm2raw_SOURCES = ppm2raw.cc
AM_CXXFLAGS = -I../../extensions -I../../libkino \
- -s -Wall $(GNOME_INCLUDEDIR) $(XML2_FLAGS) \
+ -Wall $(GNOME_INCLUDEDIR) $(XML2_FLAGS) \
-D_FILE_OFFSET_BITS=64 \
$(PIXBUF_FLAGS)
--- smilutils-0.3.2+cvs20070731.orig/apps/raw2yuv/Makefile.am
+++ smilutils-0.3.2+cvs20070731/apps/raw2yuv/Makefile.am
@@ -9,7 +9,7 @@
raw2yuv_SOURCES = raw2yuv.cc
AM_CXXFLAGS = -I../../extensions -I../../libkino \
- -s -Wall $(GNOME_INCLUDEDIR) $(XML2_FLAGS) \
+ -Wall $(GNOME_INCLUDEDIR) $(XML2_FLAGS) \
-D_FILE_OFFSET_BITS=64 \
$(PIXBUF_FLAGS)
--- smilutils-0.3.2+cvs20070731.orig/apps/raw2yuv/raw2yuv.cc
+++ smilutils-0.3.2+cvs20070731/apps/raw2yuv/raw2yuv.cc
@@ -23,6 +23,7 @@
#include <iostream>
#include <string>
+#include <cstring>
#include <cmath>
using std::string;
using std::cerr;
++++++ smilutils-gcc4.4.patch ++++++
Index: smilutils/libkino/gnome-stubs.cc
===================================================================
--- smilutils/libkino/gnome-stubs.cc
+++ smilutils/libkino/gnome-stubs.cc 2009-08-24 14:11:51.000000000 +0200
@@ -24,16 +24,16 @@
char *gnome_config_get_string( const char *path )
{
- char *ptr = strchr( path, '=' );
+ const char *ptr = strchr( path, '=' );
if ( ptr != NULL )
return strdup( ptr + 1 );
else
return NULL;
}
-char *gnome_config_get_safe( const char *path )
+const char *gnome_config_get_safe( const char *path )
{
- char *ptr = strchr( path, '=' );
+ const char *ptr = strchr( path, '=' );
if ( ptr != NULL )
return ptr + 1;
else
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org