r1326 - in /experimental/mpeg2dec/debian: changelog control patches/62_drop-arch-opts.patch patches/64_non-pic-on-i386-only.patch patches/66_add-dummy-handler-and-sanity-checks.patch patches/68_honor-cflags.patch patches/70_autoconf.patch rules watch

lool at users.alioth.debian.org lool at users.alioth.debian.org
Wed Jul 23 23:33:36 UTC 2008 

Author: lool
Date: Wed Jul 23 23:33:35 2008
New Revision: 1326

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1326
Log:
New upstream release, with ABI changes and API additions; in particular,
  care should be taken to handle the new mpeg2_state_t
  STATE_SEQUENCE_MODIFIED.
  - Target experimental for now.
  - Build-dep on libx11-dev (upstream calls AC_PATH_XTRA) and libxext-dev.
  - Drop patch 62_drop-arch-opts and build with -mcpu=i486 on i386, -mcpu=v7
    -mno-vis on sparc, -mno-altivec -UARCH_PPC on powerpc, and -UARCH_ARM on
    arm in CFLAGS instead for reasons detailed in debian/rules; upstream
    enables various features based on the GNU host triplet if the compiler
    supports them, but this would taylor the binaries for the buildds'
    capabilities which might be higher than the Debian requirements.
  - Drop patch 64_non-pic-on-i386-only, merged upstream in a slightly
    different way.
  - Drop patch 66_add-dummy-handler-and-sanity-checks, merged upstream.
  - Drop patch 68_honor-cflags, upstream doesn't empty CFLAGS anymore.
  - Drop patch 70_autoconf, not needed anymore per above removals.
  - Update watch file for new upstream tarball name (libmpeg2-*).

Removed:
    experimental/mpeg2dec/debian/patches/62_drop-arch-opts.patch
    experimental/mpeg2dec/debian/patches/64_non-pic-on-i386-only.patch
    experimental/mpeg2dec/debian/patches/66_add-dummy-handler-and-sanity-checks.patch
    experimental/mpeg2dec/debian/patches/68_honor-cflags.patch
    experimental/mpeg2dec/debian/patches/70_autoconf.patch
Modified:
    experimental/mpeg2dec/debian/changelog
    experimental/mpeg2dec/debian/control
    experimental/mpeg2dec/debian/rules
    experimental/mpeg2dec/debian/watch

Modified: experimental/mpeg2dec/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/mpeg2dec/debian/changelog?rev=1326&op=diff
==============================================================================
--- experimental/mpeg2dec/debian/changelog (original)
+++ experimental/mpeg2dec/debian/changelog Wed Jul 23 23:33:35 2008
@@ -1,10 +1,27 @@
-mpeg2dec (0.4.1-4) UNRELEASED; urgency=low
+mpeg2dec (0.5.1-1) UNRELEASED; urgency=low
 
   * Anchor package name extraction re.
   * Stop shipping *.la; only reference in rdeps is in
     /usr/lib/libextractor/libextractor_mpeg.la but apps are supposed to link
     to libextractor; hopefully libltdl3 doesn't rely on *.la or libextractor
     might require a binNMU.
+  * New upstream release, with ABI changes and API additions; in particular,
+    care should be taken to handle the new mpeg2_state_t
+    STATE_SEQUENCE_MODIFIED.
+    - Target experimental for now.
+    - Build-dep on libx11-dev (upstream calls AC_PATH_XTRA) and libxext-dev.
+    - Drop patch 62_drop-arch-opts and build with -mcpu=i486 on i386, -mcpu=v7
+      -mno-vis on sparc, -mno-altivec -UARCH_PPC on powerpc, and -UARCH_ARM on
+      arm in CFLAGS instead for reasons detailed in debian/rules; upstream
+      enables various features based on the GNU host triplet if the compiler
+      supports them, but this would taylor the binaries for the buildds'
+      capabilities which might be higher than the Debian requirements.
+    - Drop patch 64_non-pic-on-i386-only, merged upstream in a slightly
+      different way.
+    - Drop patch 66_add-dummy-handler-and-sanity-checks, merged upstream.
+    - Drop patch 68_honor-cflags, upstream doesn't empty CFLAGS anymore.
+    - Drop patch 70_autoconf, not needed anymore per above removals.
+    - Update watch file for new upstream tarball name (libmpeg2-*).
 
  -- Loic Minier <lool at dooz.org>  Fri, 11 Jul 2008 11:22:35 +0200
 

Modified: experimental/mpeg2dec/debian/control
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/mpeg2dec/debian/control?rev=1326&op=diff
==============================================================================
--- experimental/mpeg2dec/debian/control (original)
+++ experimental/mpeg2dec/debian/control Wed Jul 23 23:33:35 2008
@@ -10,7 +10,9 @@
                autotools-dev,
                dpkg-dev (>= 1.13.19),
                gnome-pkg-tools (>= 0.7),
-               libxv-dev
+               libx11-dev,
+               libxv-dev,
+               libxext-dev
 Standards-Version: 3.7.3
 Homepage: http://libmpeg2.sourceforge.net/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-multimedia

Modified: experimental/mpeg2dec/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/mpeg2dec/debian/rules?rev=1326&op=diff
==============================================================================
--- experimental/mpeg2dec/debian/rules (original)
+++ experimental/mpeg2dec/debian/rules Wed Jul 23 23:33:35 2008
@@ -13,6 +13,40 @@
     DEB_OPT_FLAG :=
 endif
 
+# override misc optimization flags which are enabled in configure.ac
+# XXX (LM) I was told sparc32 isn't so hot these days; ultrasparc might be ok
+
+# a) (all arches) this CPU override might not be needed for x86, as $host is
+#    used which should imply i486, but is probably needed for sparc as Debian's
+#    sparc port supports sun4m which is older than ultrasparc and this is
+#    safest anyway; -march should be used instead of -mcpu, but as upstream
+#    uses -mcpu, this is safest
+# XXX -mcpu=base not supported despite gcc(1) claiming so
+#CFLAGS += -mcpu=base
+ifeq ($(DEB_HOST_ARCH),i386)
+CFLAGS += -mcpu=i486
+endif
+ifeq ($(DEB_HOST_ARCH),sparc)
+CFLAGS += -mcpu=v7
+endif
+
+ifeq ($(DEB_HOST_ARCH),powerpc)
+# b) (powerpc) G3s and other OldWorld systems are still supported and don't
+#    have altivec
+CFLAGS += -mno-altivec -UARCH_PPC
+endif
+ifeq ($(DEB_HOST_ARCH),sparc)
+# c) (sparc) Debian's sparc port supports sun4m which is older than ultrasparc;
+#    VIS is an UltraSPARC extension
+CFLAGS += -mno-vis
+endif
+ifeq ($(DEB_HOST_ARCH),arm)
+# d) (arm) Debian's arm port supports two StrongARM based platforms which are
+#    only ARMv4, and hence don't have Thumb; the upstream ARM specific code
+#    requires Thumb (ldmia, stmia)
+CFLAGS += -UARCH_ARM
+endif
+
 # retrieve the shared library package name (with SONAME) from control
 libmpeg2N := $(shell sed -rn 's/^Package:[[:space:]]*(libmpeg2-[0-9]+)[[:space:]]*$$/\1/p' debian/control)
 

Modified: experimental/mpeg2dec/debian/watch
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/mpeg2dec/debian/watch?rev=1326&op=diff
==============================================================================
--- experimental/mpeg2dec/debian/watch (original)
+++ experimental/mpeg2dec/debian/watch Wed Jul 23 23:33:35 2008
@@ -1,3 +1,3 @@
 version=3
-http://libmpeg2.sourceforge.net/files/ mpeg2dec-([\d.]*).tar.gz \
+http://libmpeg2.sourceforge.net/files/ libmpeg2-([\d.]*).tar.gz \
         debian uupdate

More information about the pkg-multimedia-commits mailing list