r826 - in /unstable/libquicktime/debian: changelog patches/00list patches/02-install-in-libquicktime1.dpatch patches/20-deprecated-headers.dpatch patches/21-export-quicktime_set_window.dpatch patches/22-rtjpeg-64bit-fix.dpatch rules
fabian-guest at users.alioth.debian.org
fabian-guest at users.alioth.debian.org
Wed Jul 18 13:07:22 UTC 2007
Author: fabian-guest
Date: Wed Jul 18 13:07:22 2007
New Revision: 826
URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=826
Log:
* Pull in two more patches from the unstable branch, keep their name scheme
- 20-deprecated-headers
- 21-export-quicktime_set_window
(- 22-rtjpeg-64bit-fix)
* Bring back 02-install-in-libquicktime1.dpatch but disabled it.
* Add and remove include/quicktime -> include/lqt symlink in debian/rules.
* 05-dont-depend-on-gthread from (2:1.0.0+debian-2) already closes #433620
[debian/changelog].
Remaining issues:
- Header file include/lqt_codecapi.h includes <lqt/qtprivate.h> which won't
get installed.
- firewire-on-kfreebsd issue which I do not know anything about.
Added:
unstable/libquicktime/debian/patches/02-install-in-libquicktime1.dpatch
unstable/libquicktime/debian/patches/20-deprecated-headers.dpatch
unstable/libquicktime/debian/patches/21-export-quicktime_set_window.dpatch
unstable/libquicktime/debian/patches/22-rtjpeg-64bit-fix.dpatch
Modified:
unstable/libquicktime/debian/changelog
unstable/libquicktime/debian/patches/00list
unstable/libquicktime/debian/rules
Modified: unstable/libquicktime/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/libquicktime/debian/changelog?rev=826&op=diff
==============================================================================
--- unstable/libquicktime/debian/changelog (original)
+++ unstable/libquicktime/debian/changelog Wed Jul 18 13:07:22 2007
@@ -3,7 +3,7 @@
* Upload to unstable (Closes: #421496).
* debian/patches/02-install-in-libquicktime1.dpatch:
- + Removed.
+ + Disabled.
* debian/control:
+ Replace (and conflict with) libquicktime0.
@@ -11,10 +11,21 @@
+ New patch: Fix "lqt-config --cflags" to get the include path
(Closes: #391847).
- * debian/patches/07-rtjpeg-64bit-fix.dpatch:
- + From the unstable branch; updated by Loic Minier to replace some
- unsigned long long casts with uint64_t casts instead; should fix
- build failure on amd64 (Closes: #417055).
+ * Pulled in patches from the unstable branch...
+
+ * debian/patches/20-deprecated-headers.dpatch:
+ + Avoid inclusion of deprecated headers (Closes: #407596).
+ * debian/rules:
+ + Symlink include/quicktime to include/lqt so that libquicktime can build
+ without its own headers installed (Closes: #417042).
+
+ * debian/patches/21-export-quicktime_set_window.dpatch:
+ + Export the quicktime_set_window function.
+
+ * debian/patches/22-rtjpeg-64bit-fix.dpatch:
+ + Use proper integer types where fixed sizes are required. Updated by
+ Loic Minier to replace some unsigned long long casts with uint64_t casts
+ instead; should fix build failure on amd64 (Closes: #417055).
-- Fabian Greffrath <fabian at debian-unofficial.org> Mon, 17 Jul 2007 15:12:00 +0200
@@ -29,7 +40,8 @@
libquicktime (2:1.0.0+debian-2) experimental; urgency=low
* debian/patches/05-dont-depend-on-gthread.dpatch:
- + New patch. Don't accidentally depend on the libgthread library.
+ + New patch. Don't accidentally depend on the libgthread library
+ (Closes: #433620).
-- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Thu, 10 May 2007 14:20:24 +0200
Modified: unstable/libquicktime/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/libquicktime/debian/patches/00list?rev=826&op=diff
==============================================================================
--- unstable/libquicktime/debian/patches/00list (original)
+++ unstable/libquicktime/debian/patches/00list Wed Jul 18 13:07:22 2007
@@ -3,4 +3,6 @@
04-use-soname
05-dont-depend-on-gthread
06-lqt-config-cflags
-07-rtjpeg-64bit-fix
+20-deprecated-headers
+21-export-quicktime_set_window
+22-rtjpeg-64bit-fix
Added: unstable/libquicktime/debian/patches/02-install-in-libquicktime1.dpatch
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/libquicktime/debian/patches/02-install-in-libquicktime1.dpatch?rev=826&op=file
==============================================================================
--- unstable/libquicktime/debian/patches/02-install-in-libquicktime1.dpatch (added)
+++ unstable/libquicktime/debian/patches/02-install-in-libquicktime1.dpatch Wed Jul 18 13:07:22 2007
@@ -1,0 +1,19 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 02-install-in-libquicktime1.dpatch by Sam Hocevar <sam at zoy.org>
+##
+## DP: Install plugins in /usr/lib/libquicktime1, not /usr/lib/libquicktime
+
+ at DPATCH@
+
+diff -Naru libquicktime-1.0.0.orig/configure libquicktime-1.0.0/configure
+--- libquicktime-1.0.0.orig/configure 2007-04-25 23:04:30.000000000 +0200
++++ libquicktime-1.0.0/configure 2007-04-25 23:04:37.000000000 +0200
+@@ -2385,7 +2385,7 @@ fi
+
+
+ # Define the identity of the package.
+- PACKAGE=libquicktime
++ PACKAGE=libquicktime1
+ VERSION=1.0.0
+
+
Added: unstable/libquicktime/debian/patches/20-deprecated-headers.dpatch
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/libquicktime/debian/patches/20-deprecated-headers.dpatch?rev=826&op=file
==============================================================================
--- unstable/libquicktime/debian/patches/20-deprecated-headers.dpatch (added)
+++ unstable/libquicktime/debian/patches/20-deprecated-headers.dpatch Wed Jul 18 13:07:22 2007
@@ -1,0 +1,41 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+##
+## DP: Avoid inclusion of deprecated headers.
+
+ at DPATCH@
+
+diff -Naru libquicktime-1.0.0.orig/include/quicktime/lqt_codecapi.h libquicktime-1.0.0/include/quicktime/lqt_codecapi.h
+--- libquicktime-1.0.0.orig/include/quicktime/lqt_codecapi.h 2007-03-19 18:23:33.000000000 +0100
++++ libquicktime-1.0.0/include/quicktime/lqt_codecapi.h 2007-07-18 10:02:50.000000000 +0200
+@@ -22,8 +22,8 @@
+ Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *******************************************************************************/
+
+-#include <quicktime/lqt_version.h>
+-#include <quicktime/qtprivate.h>
++#include <lqt/lqt_version.h>
++#include <lqt/qtprivate.h>
+
+ /*
+ * Return the codec api version. This function will be defined in every
+diff -Naru libquicktime-1.0.0.orig/lqt.m4 libquicktime-1.0.0/lqt.m4
+--- libquicktime-1.0.0.orig/lqt.m4 2005-01-09 23:50:53.000000000 +0100
++++ libquicktime-1.0.0/lqt.m4 2007-07-18 10:02:19.000000000 +0200
+@@ -84,7 +84,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <quicktime/quicktime.h>
++#include <lqt/quicktime.h>
+
+ char*
+ my_strdup (char *str)
+@@ -171,7 +171,7 @@
+ LIBS="$LIBS $LQT_LIBS"
+ AC_TRY_LINK([
+ #include <stdio.h>
+-#include <quicktime/quicktime.h>
++#include <lqt/quicktime.h>
+
+ int main(int argc, char *argv[])
+ { return 0; }
Added: unstable/libquicktime/debian/patches/21-export-quicktime_set_window.dpatch
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/libquicktime/debian/patches/21-export-quicktime_set_window.dpatch?rev=826&op=file
==============================================================================
--- unstable/libquicktime/debian/patches/21-export-quicktime_set_window.dpatch (added)
+++ unstable/libquicktime/debian/patches/21-export-quicktime_set_window.dpatch Wed Jul 18 13:07:22 2007
@@ -1,0 +1,19 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+##
+## DP: Export the quicktime_set_window function.
+
+ at DPATCH@
+
+diff -Naru libquicktime-1.0.0.orig/include/quicktime/quicktime.h libquicktime-1.0.0/include/quicktime/quicktime.h
+--- libquicktime-1.0.0.orig/include/quicktime/quicktime.h 2007-02-14 12:40:53.000000000 +0100
++++ libquicktime-1.0.0/include/quicktime/quicktime.h 2007-07-18 14:31:39.000000000 +0200
+@@ -1041,6 +1041,9 @@
+
+ int quicktime_set_video_position(quicktime_t *file, int64_t frame, int track);
+
++/* set window data */
++void quicktime_set_window(quicktime_t *file, int in_x, int in_y, int in_w, int in_h, int out_w, int out_h);
++
+ /* ========================== Access to raw data follows. */
+ /* write data for one quicktime track */
+ /* the user must handle conversion to the channels in this track */
Added: unstable/libquicktime/debian/patches/22-rtjpeg-64bit-fix.dpatch
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/libquicktime/debian/patches/22-rtjpeg-64bit-fix.dpatch?rev=826&op=file
==============================================================================
--- unstable/libquicktime/debian/patches/22-rtjpeg-64bit-fix.dpatch (added)
+++ unstable/libquicktime/debian/patches/22-rtjpeg-64bit-fix.dpatch Wed Jul 18 13:07:22 2007
@@ -1,0 +1,104 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+##
+## DP: Use proper integer types where fixed sizes are required and
+## DP: replace some unsigned long long casts with uint64_t casts instead.
+
+ at DPATCH@
+
+diff -Naru libquicktime-1.0.0.orig/plugins/rtjpeg/mmx.h libquicktime-1.0.0/plugins/rtjpeg/mmx.h
+--- libquicktime-1.0.0.orig/plugins/rtjpeg/mmx.h 2007-02-14 12:40:55.000000000 +0100
++++ libquicktime-1.0.0/plugins/rtjpeg/mmx.h 2007-07-17 15:02:58.000000000 +0200
+@@ -38,15 +38,17 @@
+ * values by ULL, lest they be truncated by the compiler)
+ */
+
++#include <stdint.h>
++
+ typedef union {
+- long long q; /* Quadword (64-bit) value */
+- unsigned long long uq; /* Unsigned Quadword */
+- int d[2]; /* 2 Doubleword (32-bit) values */
+- unsigned int ud[2]; /* 2 Unsigned Doubleword */
+- short w[4]; /* 4 Word (16-bit) values */
+- unsigned short uw[4]; /* 4 Unsigned Word */
+- char b[8]; /* 8 Byte (8-bit) values */
+- unsigned char ub[8]; /* 8 Unsigned Byte */
++ int64_t q; /* Quadword (64-bit) value */
++ uint64_t uq; /* Unsigned Quadword */
++ int32_t d[2]; /* 2 Doubleword (32-bit) values */
++ uint32_t ud[2]; /* 2 Unsigned Doubleword */
++ int16_t w[4]; /* 4 Word (16-bit) values */
++ uint16_t uw[4]; /* 4 Unsigned Word */
++ int8_t b[8]; /* 8 Byte (8-bit) values */
++ uint8_t ub[8]; /* 8 Unsigned Byte */
+ float s[2]; /* Single-precision (32-bit) value */
+ } mmx_t; /* On an 8-byte (64-bit) boundary */
+
+diff -Naru libquicktime-1.0.0.orig/plugins/rtjpeg/RTjpeg.c libquicktime-1.0.0/plugins/rtjpeg/RTjpeg.c
+--- libquicktime-1.0.0.orig/plugins/rtjpeg/RTjpeg.c 2007-02-14 12:40:55.000000000 +0100
++++ libquicktime-1.0.0/plugins/rtjpeg/RTjpeg.c 2007-07-17 14:56:07.000000000 +0200
+@@ -175,8 +175,8 @@
+ for(i=0; i<64; i++)qtbl[i]=(int16_t)rtj->cqt[i];
+ }
+
+-static mmx_t RTjpeg_ones=(mmx_t)0x0001000100010001LL;
+-static mmx_t RTjpeg_half=(mmx_t)0x7fff7fff7fff7fffLL;
++static mmx_t RTjpeg_ones=(mmx_t)(uint64_t)0x0001000100010001LL;
++static mmx_t RTjpeg_half=(mmx_t)(uint64_t)0x7fff7fff7fff7fffLL;
+
+ void RTjpeg_quant(int16_t *block, int32_t *qtbl)
+ {
+@@ -233,11 +233,11 @@
+ * Perform the forward DCT on one block of samples.
+ */
+ #ifdef MMX
+-static mmx_t RTjpeg_C4 =(mmx_t)0x2D412D412D412D41LL;
+-static mmx_t RTjpeg_C6 =(mmx_t)0x187E187E187E187ELL;
+-static mmx_t RTjpeg_C2mC6=(mmx_t)0x22A322A322A322A3LL;
+-static mmx_t RTjpeg_C2pC6=(mmx_t)0x539F539F539F539FLL;
+-static mmx_t RTjpeg_zero =(mmx_t)0x0000000000000000LL;
++static mmx_t RTjpeg_C4 =(mmx_t)(uint64_t)0x2D412D412D412D41LL;
++static mmx_t RTjpeg_C6 =(mmx_t)(uint64_t)0x187E187E187E187ELL;
++static mmx_t RTjpeg_C2mC6=(mmx_t)(uint64_t)0x22A322A322A322A3LL;
++static mmx_t RTjpeg_C2pC6=(mmx_t)(uint64_t)0x539F539F539F539FLL;
++static mmx_t RTjpeg_zero =(mmx_t)(uint64_t)0x0000000000000000LL;
+
+ #else
+
+@@ -1197,11 +1197,11 @@
+ {
+ #ifdef MMX
+
+-static mmx_t fix_141 = (mmx_t)0x5a825a825a825a82LL;
+-static mmx_t fix_184n261 = (mmx_t)0xcf04cf04cf04cf04LL;
+-static mmx_t fix_184 = (mmx_t)0x7641764176417641LL;
+-static mmx_t fix_n184 = (mmx_t)0x896f896f896f896fLL;
+-static mmx_t fix_108n184 = (mmx_t)0xcf04cf04cf04cf04LL;
++static mmx_t fix_141 = (mmx_t)(uint64_t)0x5a825a825a825a82LL;
++static mmx_t fix_184n261 = (mmx_t)(uint64_t)0xcf04cf04cf04cf04LL;
++static mmx_t fix_184 = (mmx_t)(uint64_t)0x7641764176417641LL;
++static mmx_t fix_n184 = (mmx_t)(uint64_t)0x896f896f896f896fLL;
++static mmx_t fix_108n184 = (mmx_t)(uint64_t)0xcf04cf04cf04cf04LL;
+
+ mmx_t *wsptr = (mmx_t *)rtj->ws;
+ register mmx_t *dataptr = (mmx_t *)odata;
+@@ -2443,8 +2443,8 @@
+ if (*cm < 0) *cm = 0;
+ if (*cm > 16) *cm = 16;
+ #ifdef MMX
+- rtj->lmask=(mmx_t)(((unsigned long long)(*lm)<<48)|((unsigned long long)(*lm)<<32)|((unsigned long long)(*lm)<<16)|(unsigned long long)(*lm));
+- rtj->cmask=(mmx_t)(((unsigned long long)(*cm)<<48)|((unsigned long long)(*cm)<<32)|((unsigned long long)(*cm)<<16)|(unsigned long long)(*cm));
++ rtj->lmask=(mmx_t)(((uint64_t)(*lm)<<48)|((uint64_t)(*lm)<<32)|((uint64_t)(*lm)<<16)|(uint64_t)(*lm));
++ rtj->cmask=(mmx_t)(((uint64_t)(*cm)<<48)|((uint64_t)(*cm)<<32)|((uint64_t)(*cm)<<16)|(uint64_t)(*cm));
+ #else
+ rtj->lmask=*lm;
+ rtj->cmask=*cm;
+@@ -2765,7 +2765,7 @@
+ mmx_t *mold=(mmx_t *)old;
+ mmx_t *mblock=(mmx_t *)rblock;
+ volatile mmx_t result;
+- static mmx_t neg=(mmx_t)0xffffffffffffffffULL;
++ static mmx_t neg=(mmx_t)(uint64_t)0xffffffffffffffffULL;
+
+ movq_m2r(*mask, mm7);
+ movq_m2r(neg, mm6);
Modified: unstable/libquicktime/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/libquicktime/debian/rules?rev=826&op=diff
==============================================================================
--- unstable/libquicktime/debian/rules (original)
+++ unstable/libquicktime/debian/rules Wed Jul 18 13:07:22 2007
@@ -31,6 +31,8 @@
build-stamp: config.status
dh_testdir
+ ln -sf quicktime include/lqt
+
# Building package
$(MAKE)
@@ -49,6 +51,8 @@
ifneq "$(wildcard /usr/share/misc/config.guess)" ""
cp -f /usr/share/misc/config.guess config.guess
endif
+
+ rm -rf include/lqt
dh_clean
More information about the pkg-multimedia-commits
mailing list