Hello community,
here is the log from the commit of package mjpegtools for openSUSE:Factory
checked in at Mon Apr 4 12:57:40 CEST 2011.
--------
--- mjpegtools/mjpegtools.changes 2010-09-02 16:15:30.000000000 +0200
+++ /mounts/work_src_done/STABLE/mjpegtools/mjpegtools.changes 2011-02-09
18:14:11.000000000 +0100
@@ -1,0 +2,20 @@
+Wed Feb 9 18:12:41 CET 2011 - p...@suse.de
+
+- Optimize the handling of CFLAGS.
+- Don't use -fno-strict-aliasing as the compiler doesn't report
+ any aliasing issues.
+
+-------------------------------------------------------------------
+Wed Feb 9 17:20:30 CET 2011 - p...@suse.de
+
+- Use AC_PREREQ before AC_INIT
+- Move AM_INIT_AUTOMAKE to just after AC_INIT
+- Use LT_INIT to init libtool and pass disable-static as default.
+- Only pass -release to libtool and not -release and -version-info,
+ thus fixing the library naming.
+- Add and use an option to configure to disable processor specific
+ code tuning.
+- Don't bother with patching .in files as they're regenerated by
+ calling autoreconf.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
mjpegtools-fix_init.patch
mjpegtools-fix_lib_versioning.patch
mjpegtools-no_arch_tuning.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mjpegtools.spec ++++++
--- /var/tmp/diff_new_pack.XSyEnk/_old 2011-04-04 12:55:45.000000000 +0200
+++ /var/tmp/diff_new_pack.XSyEnk/_new 2011-04-04 12:55:45.000000000 +0200
@@ -28,11 +28,12 @@
PreReq: %install_info_prereq
AutoReqProv: on
Version: 1.9.0
-Release: 12
+Release: 16
Summary: MJPEG Video Capture and Processing Tools
%if 0%{?BUILD_ORIG}
Source0: %{name}-%{version}.tar.bz2
%else
+# FIXME read the comment at the top.
# WARNING: This is not a comment, but a real command to repack souce:
#%(sh %{_sourcedir}/%{name}-codecpatch.sh %{_sourcedir}
%{name}-%{version}.tar.bz2 %{name}-%{version}-patched.tar.bz2 )
Source0: %{name}-%{version}-patched.tar.bz2
@@ -46,8 +47,13 @@
Patch7: mjpegtools-fix-invalid-conversion.patch
Patch8: mjpegtools-1.9.0-fix-compiler-error.patch
Patch9: mjpegtools-jpeg-7.patch
+Patch10: mjpegtools-fix_init.patch
+Patch11: mjpegtools-fix_lib_versioning.patch
+Patch12: mjpegtools-no_arch_tuning.patch
Patch100: %{name}-codecpatch.patch
+%define lib_version %(echo %{version}|cut -d. -f1-2)
+
%description
The mjpegtools allow for capture, playback, processing, and simple
editing of MJPEG AV data. The hardware I/O applications are intended
@@ -67,17 +73,14 @@
%package devel
License: BSD3c(or similar) ; GPLv2+
-Group: Productivity/Multimedia/Video/Editors and Convertors
+Group: Development/Libraries/C and C++
Summary: MJPEG Video Capture and Processing Tools
Requires: %{name} = %{version}
Requires: SDL-devel glibc-devel zlib-devel libdv-devel libjpeg-devel
libquicktime-devel
%description devel
-The mjpegtools allow for capture, playback, processing, and simple
-editing of MJPEG AV data. The hardware I/O applications are intended
-for use with Zoran MJPEG framegrabber-based hardware (see the
-zoran-driver package), but the processing tools can be used with MJPEG
-data from other sources as well.
+This package contains all files needed to develop code that uses the
+mjpegtools libraries.
@@ -104,21 +107,22 @@
# remove references to files removed by %{name}-codecpatch.sh
%patch100 -p1
%endif
-# overwrite cpuinfo.sh, cpu optimization does not make sense
-# when building for a distribution
-echo "" > cpuinfo.sh
+%patch10
+%patch11
+%patch12
%build
%if 0%{?BUILD_ORIG}
sed -i~ '/currently broken/d' mpeg2enc/mpeg2enc.cc
diff -u mpeg2enc/mpeg2enc.cc* || :
%endif
-%ifarch %ix86
- export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
-%else
- export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC"
+CFLAGS="%{optflags}"
+CXXFLAGS="%{optflags}"
+
+%ifnarch %ix86
+ CFLAGS+=" -fPIC"
%endif
-export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
+export CXXFLAGS CFLAGS
autoreconf -vfi
# disable linking against libmpeg2encpp on ppc architectures
./configure \
@@ -130,7 +134,7 @@
--mandir=%{_mandir} \
--infodir=%{_infodir} \
--disable-warnings_as_errors \
- --disable-static
+ --disable-arch_tuning
# --with-quicktime=/usr/include/quicktime \
# --with-dv=/usr \
%{__make} %{?jobs:-j%jobs}
@@ -145,6 +149,7 @@
rm -f %{buildroot}%{_mandir}/man1/${app}.*
done
%endif
+rm -f %{buildroot}/%{_libdir}/*.la
%clean
rm -rf "%{buildroot}"
@@ -161,7 +166,7 @@
%defattr(-,root,root)
%doc AUTHORS CHANGES COPYING ChangeLog HINTS README*
%{_bindir}/*
-%{_libdir}/lib*.so.*
+%{_libdir}/lib*-%{lib_version}.so
%doc %{_mandir}/man1/*.1.gz
%doc %{_mandir}/man5/*.5.gz
%doc %{_infodir}/mjpeg-howto*
@@ -169,8 +174,12 @@
%files devel
%defattr(-,root,root)
%{_includedir}/mjpegtools
-%{_libdir}/lib*.so
-%{_libdir}/lib*.la
+%{_libdir}/liblavfile.so
+%{_libdir}/liblavjpeg.so
+%{_libdir}/liblavplay.so
+%{_libdir}/liblavrec.so
+%{_libdir}/libmjpegutils.so
+%{_libdir}/libmplex2.so
%{_libdir}/pkgconfig/mjpegtools.pc
%changelog
++++++ mjpegtools-1.9.0-patched.tar.bz2 ++++++
++++++ mjpegtools-codecpatch.patch ++++++
--- /var/tmp/diff_new_pack.XSyEnk/_old 2011-04-04 12:55:46.000000000 +0200
+++ /var/tmp/diff_new_pack.XSyEnk/_new 2011-04-04 12:55:46.000000000 +0200
@@ -27,15 +27,3 @@
scripts \
docs \
--- 10,16 ----
-*** mjpegtools-1.9.0rc2.orig/Makefile.in 2007-03-04 16:11:53.000000000
+0100
---- mjpegtools-1.9.0rc2/Makefile.in 2007-08-09 17:40:03.788669168 +0200
-@@ -245,9 +245,7 @@
- top_srcdir = @top_srcdir@
- SUBDIRS = \
- utils \
-- mpeg2enc \
- lavtools \
-- aenc \
- mplex \
- scripts \
- docs \
++++++ mjpegtools-fix_init.patch ++++++
Index: configure.ac
===================================================================
--- configure.ac.orig 2011-02-09 15:35:12.000000000 +0100
+++ configure.ac 2011-02-09 15:38:52.017702355 +0100
@@ -1,7 +1,9 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT([mjpegtools],[1.9.0],[mjpeg-develo...@lists.sourceforge.net])
AC_PREREQ(2.57)
+AC_INIT([mjpegtools],[1.9.0],[mjpeg-develo...@lists.sourceforge.net])
AC_CONFIG_SRCDIR([lavtools/lav_io.c])
+AM_INIT_AUTOMAKE()
+LT_INIT([disable-static])
MJPEG_MAJOR_VERSION=1
MJPEG_MINOR_VERSION=9
@@ -13,7 +15,6 @@ AC_CONFIG_HEADERS([config.h])
AC_CANONICAL_HOST
dnl CANONICAL-TARGET is only there because SDL's sdl.m4 is broken. bleah.
AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE([1.7])
AM_MAINTAINER_MODE
++++++ mjpegtools-fix_lib_versioning.patch ++++++
Index: lavtools/Makefile.am
===================================================================
--- lavtools/Makefile.am.orig 2008-05-05 16:28:44.000000000 +0200
+++ lavtools/Makefile.am 2011-02-09 16:18:46.052622009 +0100
@@ -34,9 +34,8 @@ liblavinclude_HEADERS = \
audiolib.h
LAV_ALL_LIB_OPTS = \
- $(LT_STATIC) \
- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
- -release $(LT_RELEASE) $(EXTRA_LDFLAGS)
+ $(LTV_STATIC) \
+ -release $(LTV_RELEASE) $(EXTRA_LDFLAGS)
liblavfile_la_SOURCES = editlist.c lav_io.c avilib.c
liblavfile_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBDV_CFLAGS) $(JPEG_CFLAGS)
Index: mplex/Makefile.am
===================================================================
--- mplex/Makefile.am.orig 2007-02-26 18:05:49.000000000 +0100
+++ mplex/Makefile.am 2011-02-09 16:18:49.628394868 +0100
@@ -63,9 +63,8 @@ libmplex_include_HEADERS = \
videostrm.hpp
libmplex2_la_LDFLAGS = \
- $(LT_STATIC) \
- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
- -release $(LT_RELEASE) $(EXTRA_LDFLAGS)
+ $(LTV_STATIC) \
+ -release $(LTV_RELEASE) $(EXTRA_LDFLAGS)
libmplex2_la_LIBADD = \
$(top_builddir)/utils/libmjpegutils.la
Index: utils/Makefile.am
===================================================================
--- utils/Makefile.am.orig 2007-08-09 13:50:03.000000000 +0200
+++ utils/Makefile.am 2011-02-09 16:18:52.716198719 +0100
@@ -25,9 +25,8 @@ endif
libmjpegutils_la_LIBADD = $(mmxsse_lib) $(altivec_lib)
libmjpegutils_la_LDFLAGS = \
- $(LT_STATIC) \
- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
- -release $(LT_RELEASE) $(EXTRA_LDFLAGS)
+ $(LTV_STATIC) \
+ -release $(LTV_RELEASE) $(EXTRA_LDFLAGS)
libmjpegutils_la_SOURCES = \
mjpeg_logging.c \
Index: configure.ac
===================================================================
--- configure.ac.orig 2011-02-09 16:18:13.016720545 +0100
+++ configure.ac 2011-02-09 16:18:22.616110765 +0100
@@ -19,15 +19,9 @@ AM_MAINTAINER_MODE
# libtool versioning
-LT_RELEASE=$MJPEG_MAJOR_VERSION.$MJPEG_MINOR_VERSION
-LT_CURRENT=$MJPEG_MICRO_VERSION
-LT_REVISION=$MJPEG_MICRO_VERSION
-LT_AGE=$MJPEG_MICRO_VERSION
-AC_SUBST(LT_RELEASE)
-AC_SUBST(LT_CURRENT)
-AC_SUBST(LT_REVISION)
-AC_SUBST(LT_AGE)
-AC_SUBST(LT_STATIC)
+LTV_RELEASE=$MJPEG_MAJOR_VERSION.$MJPEG_MINOR_VERSION
+AC_SUBST(LTV_RELEASE)
+AC_SUBST(LTV_STATIC)
dnl **********************************************************************
dnl Options
@@ -453,7 +447,7 @@ fi
dnl **********************************************************************
dnl Handle forcing static linkage in key places
if test "x$enable_force_static" = "xyes" ; then
- LT_STATIC=-all-static
+ LTV_STATIC=-all-static
fi
++++++ mjpegtools-no_arch_tuning.patch ++++++
In a distribution you don't want to compile for the CPU you happen
to build the code on. So add an optionb to disable automatic tuning.
Index: configure.ac
===================================================================
--- configure.ac.orig 2011-02-09 16:21:51.834820601 +0100
+++ configure.ac 2011-02-09 16:40:53.583304265 +0100
@@ -421,27 +421,34 @@ dnl done with the helper script cpuinfo.
dnl correctly is complex and lengthy (about as long as the entire configure.ac
dnl file).
-if test x$have_x86cpu = xtrue -o x$have_ppccpu = xtrue; then
- if test x$host_alias != x; then
- dnl This is to allow cross compiling
- AC_MSG_CHECKING(sub-architecture settings)
- if test x$have_x86cpu = xtrue; then
- host_mod_cpu=`echo $host_cpu | tr _ -`
- ARCHFLAGS="-march=$host_mod_cpu -mcpu=$host_mod_cpu"
- fi
- else
- if test ! -r $srcdir/cpuinfo.sh; then
- AC_MSG_ERROR([cpuinfo.sh script not found - do a cvs update])
- fi
- AC_MSG_CHECKING(sub-architecture settings)
- chmod +x $srcdir/cpuinfo.sh
- if test x$have_x86cpu = xtrue; then
- ARCHFLAGS=`$srcdir/cpuinfo.sh x86`
- elif test x$have_ppccpu = xtrue; then
- ARCHFLAGS=`$srcdir/cpuinfo.sh ppc`
+AC_ARG_ENABLE([arch_tuning],
+ AS_HELP_STRING([--disable-arch_tuning],
+ [Disable automatic tuning of code generation for
specific processors])
+ [arch_tuning=$enableval], [arch_tuning=$enableval])
+
+if test x$arch_tuning != xno; then
+ if test x$have_x86cpu = xtrue -o x$have_ppccpu = xtrue; then
+ if test x$host_alias != x; then
+ dnl This is to allow cross compiling
+ AC_MSG_CHECKING(sub-architecture settings)
+ if test x$have_x86cpu = xtrue; then
+ host_mod_cpu=`echo $host_cpu | tr _ -`
+ ARCHFLAGS="-march=$host_mod_cpu -mcpu=$host_mod_cpu"
+ fi
+ else
+ if test ! -r $srcdir/cpuinfo.sh; then
+ AC_MSG_ERROR([cpuinfo.sh script not found - do a cvs update])
+ fi
+ AC_MSG_CHECKING(sub-architecture settings)
+ chmod +x $srcdir/cpuinfo.sh
+ if test x$have_x86cpu = xtrue; then
+ ARCHFLAGS=`$srcdir/cpuinfo.sh x86`
+ elif test x$have_ppccpu = xtrue; then
+ ARCHFLAGS=`$srcdir/cpuinfo.sh ppc`
+ fi
fi
+ AC_MSG_RESULT($ARCHFLAGS)
fi
- AC_MSG_RESULT($ARCHFLAGS)
fi
dnl **********************************************************************
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
