r242 - in experimental/libquicktime/debian: . patches

Thu Mar 22 20:41:44 CET 2007

Author: fabian-guest
Date: 2007-03-22 19:41:44 +0000 (Thu, 22 Mar 2007)
New Revision: 242

Added:
   experimental/libquicktime/debian/patches/02-x264.dpatch
Modified:
   experimental/libquicktime/debian/changelog
   experimental/libquicktime/debian/control
   experimental/libquicktime/debian/patches/00list
   experimental/libquicktime/debian/rules
Log:
  * debian/control:
    + Added libfaad-dev and libx264-dev to Build-Depends.
  * debian/rules:
    + Added unpatch to clean rule.
  * debian/patches/02-x264.dpatch:
    + Patch for newer x264 versions by Alexis Ballier.


Modified: experimental/libquicktime/debian/changelog
===================================================================

--- experimental/libquicktime/debian/changelog	2007-03-22 11:06:05 UTC (rev 241)
+++ experimental/libquicktime/debian/changelog	2007-03-22 19:41:44 UTC (rev 242)
@@ -10,10 +10,15 @@
     + Added Homepage: to package descriptions.
     + Added ${misc:Depends} to binary packages' dependencies.
     + Use ${binary:Version} instead of ${Source-Version}.
+    + Added libfaad-dev and libx264-dev to Build-Depends.
   * debian/compat:
     + Set compat to 5.
   * debian/copyright:
     + Merged with debian/copyright from upstream tarball.
+  * debian/rules:
+    + Added unpatch to clean rule.
+  * debian/patches/02-x264.dpatch:
+    + Patch for newer x264 versions by Alexis Ballier.
 
  -- Fabian Greffrath <fabian at debian-unofficial.org>  Tue, 20 Mar 2007 11:20:00 +0100
 

Modified: experimental/libquicktime/debian/control
===================================================================
--- experimental/libquicktime/debian/control	2007-03-22 11:06:05 UTC (rev 241)
+++ experimental/libquicktime/debian/control	2007-03-22 19:41:44 UTC (rev 242)
@@ -4,7 +4,7 @@
 Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 Uploaders: Fabian Greffrath <fabian at debian-unofficial.org>, Sam Hocevar (Debian packages) <sam+deb at zoy.org>
 Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 5), dpatch, autotools-dev, libavc1394-dev [!hurd-i386 !kfreebsd-amd64 !kfreebsd-i386], libavcodec-dev, libdv4-dev, libgtk2.0-dev, libjpeg62-dev, libpng12-dev, libpopt-dev, libraw1394-dev [!hurd-i386 !kfreebsd-amd64 !kfreebsd-i386], libsdl1.2-dev, libvorbis-dev, libxaw7-dev, libxv-dev
+Build-Depends: debhelper (>= 5), dpatch, autotools-dev, libavc1394-dev [!hurd-i386 !kfreebsd-amd64 !kfreebsd-i386], libavcodec-dev, libdv4-dev, libfaad-dev, libgtk2.0-dev, libjpeg62-dev, libpng12-dev, libpopt-dev, libraw1394-dev [!hurd-i386 !kfreebsd-amd64 !kfreebsd-i386], libsdl1.2-dev, libvorbis-dev, libx264-dev, libxaw7-dev, libxv-dev
 XS-Vcs-Svn: svn://svn.debian.org/pkg-multimedia/experimental/libquicktime
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-multimedia/experimental/libquicktime/
 

Modified: experimental/libquicktime/debian/patches/00list
===================================================================
--- experimental/libquicktime/debian/patches/00list	2007-03-22 11:06:05 UTC (rev 241)
+++ experimental/libquicktime/debian/patches/00list	2007-03-22 19:41:44 UTC (rev 242)
@@ -1 +1,2 @@
 01-debian-directory
+02-x264

Added: experimental/libquicktime/debian/patches/02-x264.dpatch
===================================================================
--- experimental/libquicktime/debian/patches/02-x264.dpatch	2007-03-22 11:06:05 UTC (rev 241)
+++ experimental/libquicktime/debian/patches/02-x264.dpatch	2007-03-22 19:41:44 UTC (rev 242)
@@ -0,0 +1,82 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## libquicktime-0.9.10-x264.patch from Gentoo
+
+ at DPATCH@
+
+--- libquicktime-0.9.10/plugins/x264/x264.c.old	2006-10-15 01:14:30.000000000 +0200
++++ libquicktime-0.9.10/plugins/x264/x264.c	2006-10-15 01:15:00.000000000 +0200
+@@ -91,7 +91,11 @@
+   fprintf(stderr, "    i_qp_step:          %d\n", params->rc.i_qp_step);
+   fprintf(stderr, "    b_cbr:              %d\n", params->rc.b_cbr);
+   fprintf(stderr, "    i_bitrate:          %d\n", params->rc.i_bitrate);
++#if X264_BUILD < 54
+   fprintf(stderr, "    i_rf_constant:      %d\n", params->rc.i_rf_constant);
++#else
++  fprintf(stderr, "    f_rf_constant:      %f\n", params->rc.f_rf_constant);
++#endif
+   fprintf(stderr, "    f_rate_tolerance:   %f\n", params->rc.f_rate_tolerance);
+   fprintf(stderr, "    i_vbv_max_bitrate:  %d\n", params->rc.i_vbv_max_bitrate);
+   fprintf(stderr, "    i_vbv_buffer_size:  %d\n", params->rc.i_vbv_buffer_size);
+@@ -493,7 +497,11 @@
+       {
+       /* Force ABR */
+       codec->params.rc.i_rc_method = X264_RC_ABR;
++#if X264_BUILD < 54
+       codec->params.rc.i_rf_constant = 0;
++#else
++      codec->params.rc.f_rf_constant = 0.;
++#endif
+       if(codec->pass == 1)
+         {
+         /* Strings will be made private by x264 */
+@@ -655,7 +663,11 @@
+   INTPARAM("x264_i_bitrate", codec->params.rc.i_bitrate);
+   
+   INTPARAM("x264_i_qp_constant", codec->params.rc.i_qp_constant);
++#if X264_BUILD < 54
+   INTPARAM("x264_i_rf_constant", codec->params.rc.i_rf_constant);
++#else
++  FLOATPARAM("x264_f_rf_constant", codec->params.rc.f_rf_constant);
++#endif
+   INTPARAM("x264_i_qp_min", codec->params.rc.i_qp_min);
+   INTPARAM("x264_i_qp_max", codec->params.rc.i_qp_max);
+   INTPARAM("x264_i_qp_step", codec->params.rc.i_qp_step);
+--- libquicktime-0.9.10/plugins/x264/lqt_x264.c.old	2006-10-15 01:14:38.000000000 +0200
++++ libquicktime-0.9.10/plugins/x264/lqt_x264.c	2006-10-15 01:15:00.000000000 +0200
+@@ -3,6 +3,9 @@
+ #include <quicktime/lqt_codecapi.h>
+ #include <quicktime/colormodels.h>
+ 
++/* To get X264_BUILD value */
++#include <x264.h>
++
+ void quicktime_init_codec_x264(quicktime_video_map_t *vtrack);
+ 
+ static char * fourccs_x264[]  = { "avc1", (char*)0 };
+@@ -95,6 +98,7 @@
+       val_default: { val_int: 0 },
+       help_string: "Bitrate in kbit/s. 0 means VBR (recommended)"
+     },
++#if X264_BUILD < 54
+     {
+       name:        "x264_i_rf_constant",
+       real_name:   "Nominal Quantizer parameter",
+@@ -105,6 +109,18 @@
+       help_string: "This selects the nominal quantizer to use (1 to 51). Lower values result in " \
+     "better fidelity, but higher bitrates. 26 is a good default value. 0 means lossless."
+     },
++#else
++    {
++      name:        "x264_f_rf_constant",
++      real_name:   "Nominal Quantizer parameter",
++      type:        LQT_PARAMETER_FLOAT,
++      val_default: { val_float: 26.0 },
++      val_min:     { val_float: 0.0 },
++      val_max:     { val_float: 51.0 },
++      help_string: "This selects the nominal quantizer to use (1 to 51). Lower values result in " \
++    "better fidelity, but higher bitrates. 26 is a good default value. 0 means lossless."
++    },
++#endif
+     {
+       name:        "x264_i_qp_constant",
+       real_name:   "Quantizer parameter",

Modified: experimental/libquicktime/debian/rules
===================================================================
--- experimental/libquicktime/debian/rules	2007-03-22 11:06:05 UTC (rev 241)
+++ experimental/libquicktime/debian/rules	2007-03-22 19:41:44 UTC (rev 242)
@@ -34,7 +34,7 @@
 
 	touch build-stamp
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp


