--- xvid4conf-1.12.orig/debian/README.source +++ xvid4conf-1.12/debian/README.source @@ -0,0 +1,2 @@ + +See /usr/share/doc/quilt/README.source --- xvid4conf-1.12.orig/debian/changelog +++ xvid4conf-1.12/debian/changelog @@ -0,0 +1,53 @@ +xvid4conf (1.12-dmo2ubuntu1) trusty; urgency=low + + * Merge from deb-multimedia. Remaining changes: + - debian/control: added Homepage field + * Enable hardening + * Add debian/watch + + -- Jackson Doak Wed, 20 Nov 2013 06:56:13 +1100 + +xvid4conf (1.12-dmo2) unstable; urgency=low + + * New patch to fix Gtk-Warning on GtkSpinButton. + + -- Christian Marillat Sat, 22 Jun 2013 11:17:20 +0200 + +xvid4conf (1.12-dmo1) unstable; urgency=low + + * Updated to Standards-Version: 3.9.3 + + -- Christian Marillat Sun, 27 May 2012 09:46:03 +0200 + +xvid4conf (1.12-0.2) unstable; urgency=low + + * Rebuild to add missing Checksums-Sha1 and Checksums-Sha256 fields in .dsc + file. + + -- Christian Marillat Sun, 07 Feb 2010 20:20:58 +0100 + +xvid4conf (1.12-0.1ubuntu1) quantal; urgency=low + + * debian/control: added Homepage field per Debian Policy + * debian/control: added missing ${misc:Depends} to depends line + + -- Benjamin Kerensa Mon, 17 Sep 2012 12:22:54 +0100 + +xvid4conf (1.12-0.1) unstable; urgency=low + + * Rebuild for amd64. + + -- Christian Marillat Sun, 14 May 2006 14:43:21 +0200 + +xvid4conf (1.12-0.0) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Sat, 7 Feb 2004 16:53:56 +0100 + +xvid4conf (1.9-0.0) unstable; urgency=low + + * Initial Release. + + -- Christian Marillat Sun, 25 Jan 2004 14:16:20 +0100 + --- xvid4conf-1.12.orig/debian/compat +++ xvid4conf-1.12/debian/compat @@ -0,0 +1 @@ +9 --- xvid4conf-1.12.orig/debian/control +++ xvid4conf-1.12/debian/control @@ -0,0 +1,18 @@ +Source: xvid4conf +Section: graphics +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Christian Marillat +Bugs: mailto:marillat@deb-multimedia.org +Standards-Version: 3.9.4 +Build-Depends: debhelper (>= 9), libgtk2.0-dev, quilt +Homepage: http://tibit.org/hacks/ + +Package: xvid4conf +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: creates XviD configuration files + This tool creates XviD configuration files. The generated configuration + file is meant to be read by transcodes xvid4 export module. This module + (and so the configuration file) is intended to be used with XviD 1.0 + (dev-api-4) --- xvid4conf-1.12.orig/debian/copyright +++ xvid4conf-1.12/debian/copyright @@ -0,0 +1,13 @@ +This package was debianized by Christian Marillat on +Sun, 25 Jan 2004 14:16:20 +0100. + +It was downloaded from http://zebra.fh-weingarten.de/~transcode/xvid4conf/ + +Upstream Author: Tilmann Bitterberg + +Copyright: 2003, 2004 Tilmann Bitterberg + + You should have received a copy of the GNU General Public License with the + Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL; if + not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth + Floor, Boston, MA 02110-1301, USA. --- xvid4conf-1.12.orig/debian/patches/01_GtkSpinButton.diff +++ xvid4conf-1.12/debian/patches/01_GtkSpinButton.diff @@ -0,0 +1,310 @@ +--- a/xvid4conf2.glade ++++ b/xvid4conf2.glade +@@ -650,7 +650,7 @@ This setting allow you to favorize or no + GTK_UPDATE_ALWAYS + False + False +- 0 -255 255 1 10 10 ++ 0 -255 255 1 10 0 + + + 1 +@@ -674,7 +674,7 @@ This two settings allow you to tune the + GTK_UPDATE_ALWAYS + False + False +- 100 0 200 1 10 10 ++ 100 0 200 1 10 0 + + + 1 +@@ -698,7 +698,7 @@ This two settings allow you to tune the + GTK_UPDATE_ALWAYS + False + False +- 150 0 200 1 10 10 ++ 150 0 200 1 10 0 + + + 1 +@@ -727,7 +727,7 @@ You must be aware that the higher max_bf + GTK_UPDATE_ALWAYS + False + False +- 2 0 10 1 10 10 ++ 2 0 10 1 10 0 + + + +@@ -947,7 +947,7 @@ This setting allows you to choose the (1 + GTK_UPDATE_ALWAYS + False + False +- 0 0 100 1 10 10 ++ 0 0 100 1 10 0 + + + 1 +@@ -1165,7 +1165,7 @@ This option activates PSNR measurement, + GTK_UPDATE_ALWAYS + False + False +- 2 1 31 1 10 10 ++ 2 1 31 1 10 0 + + + 1 +@@ -1189,7 +1189,7 @@ This option activates PSNR measurement, + GTK_UPDATE_ALWAYS + False + False +- 2 1 31 1 10 10 ++ 2 1 31 1 10 0 + + + 1 +@@ -1213,7 +1213,7 @@ This option activates PSNR measurement, + GTK_UPDATE_ALWAYS + False + False +- 2 1 31 1 10 10 ++ 2 1 31 1 10 0 + + + 1 +@@ -1237,7 +1237,7 @@ This option activates PSNR measurement, + GTK_UPDATE_ALWAYS + False + False +- 31 1 31 1 10 10 ++ 31 1 31 1 10 0 + + + 2 +@@ -1261,7 +1261,7 @@ This option activates PSNR measurement, + GTK_UPDATE_ALWAYS + False + False +- 31 1 31 1 10 10 ++ 31 1 31 1 10 0 + + + 2 +@@ -1285,7 +1285,7 @@ This option activates PSNR measurement, + GTK_UPDATE_ALWAYS + False + False +- 31 1 31 1 10 10 ++ 31 1 31 1 10 0 + + + 2 +@@ -2091,7 +2091,7 @@ Think of that setting like a shrinking f + GTK_UPDATE_ALWAYS + False + False +- 0 0 100 1 10 10 ++ 0 0 100 1 10 0 + + + 1 +@@ -2115,7 +2115,7 @@ Think of that setting like a growing fac + GTK_UPDATE_ALWAYS + False + False +- 0 0 100 1 10 10 ++ 0 0 100 1 10 0 + + + 1 +@@ -2209,7 +2209,7 @@ Value = [0..100] + GTK_UPDATE_ALWAYS + False + False +- 0 0 100 1 10 10 ++ 0 0 100 1 10 0 + + + 1 +@@ -2233,7 +2233,7 @@ NB: This setting impacts quality a lot, + GTK_UPDATE_ALWAYS + False + False +- 5 0 100 1 10 10 ++ 5 0 100 1 10 0 + + + 1 +@@ -2255,7 +2255,7 @@ NB: This setting impacts quality a lot, + GTK_UPDATE_ALWAYS + False + False +- 5 0 100 1 10 10 ++ 5 0 100 1 10 0 + + + 1 +@@ -2277,7 +2277,7 @@ NB: This setting impacts quality a lot, + GTK_UPDATE_ALWAYS + False + False +- 5 0 100 1 10 10 ++ 5 0 100 1 10 0 + + + 1 +--- a/src/interface.c ++++ b/src/interface.c +@@ -471,7 +471,7 @@ create_window1 (void) + gtk_misc_set_alignment (GTK_MISC (bframe_threshold_label), 0, 0.5); + gtk_misc_set_padding (GTK_MISC (bframe_threshold_label), 2, 6); + +- bframe_threshold_adj = gtk_adjustment_new (0, -255, 255, 1, 10, 10); ++ bframe_threshold_adj = gtk_adjustment_new (0, -255, 255, 1, 10, 0); + bframe_threshold = gtk_spin_button_new (GTK_ADJUSTMENT (bframe_threshold_adj), 1, 0); + gtk_widget_show (bframe_threshold); + gtk_table_attach (GTK_TABLE (table2), bframe_threshold, 1, 2, 3, 4, +@@ -479,7 +479,7 @@ create_window1 (void) + (GtkAttachOptions) (0), 2, 0); + gtk_tooltips_set_tip (tooltips, bframe_threshold, "Sometimes BFrames do not look good, and introduce artefacts when most of the frame is static and some small zones have high motion (a static scene with a man talking, his mouth will probably look bad if what is surrounding the man and his mouth is completly static)\n\nThis setting allow you to favorize or not, the use of bframes. The higher the value, the more a bframe has chance to be used.", NULL); + +- bquant_offset_adj = gtk_adjustment_new (100, 0, 200, 1, 10, 10); ++ bquant_offset_adj = gtk_adjustment_new (100, 0, 200, 1, 10, 0); + bquant_offset = gtk_spin_button_new (GTK_ADJUSTMENT (bquant_offset_adj), 1, 0); + gtk_widget_show (bquant_offset); + gtk_table_attach (GTK_TABLE (table2), bquant_offset, 1, 2, 2, 3, +@@ -487,7 +487,7 @@ create_window1 (void) + (GtkAttachOptions) (0), 2, 0); + gtk_tooltips_set_tip (tooltips, bquant_offset, "As explained before, BFrames are highly correlated to its reference frames Thus XviD computes their quantizer to its reference's quantizers.\nThis two settings allow you to tune the formula:", NULL); + +- bquant_ratio_adj = gtk_adjustment_new (150, 0, 200, 1, 10, 10); ++ bquant_ratio_adj = gtk_adjustment_new (150, 0, 200, 1, 10, 0); + bquant_ratio = gtk_spin_button_new (GTK_ADJUSTMENT (bquant_ratio_adj), 1, 0); + gtk_widget_show (bquant_ratio); + gtk_table_attach (GTK_TABLE (table2), bquant_ratio, 1, 2, 1, 2, +@@ -495,7 +495,7 @@ create_window1 (void) + (GtkAttachOptions) (0), 2, 0); + gtk_tooltips_set_tip (tooltips, bquant_ratio, "As explained before, BFrames are highly correlated to its reference frames Thus XviD computes their quantizer to its reference's quantizers.\nThis two settings allow you to tune the formula:", NULL); + +- max_bframes_adj = gtk_adjustment_new (2, 0, 10, 1, 10, 10); ++ max_bframes_adj = gtk_adjustment_new (2, 0, 10, 1, 10, 0); + max_bframes = gtk_spin_button_new (GTK_ADJUSTMENT (max_bframes_adj), 1, 0); + gtk_widget_show (max_bframes); + gtk_table_attach (GTK_TABLE (table2), max_bframes, 1, 2, 0, 1, +@@ -570,7 +570,7 @@ create_window1 (void) + gtk_label_set_justify (GTK_LABEL (label80), GTK_JUSTIFY_LEFT); + gtk_misc_set_alignment (GTK_MISC (label80), 0, 0.5); + +- frame_drop_ratio_adj = gtk_adjustment_new (0, 0, 100, 1, 10, 10); ++ frame_drop_ratio_adj = gtk_adjustment_new (0, 0, 100, 1, 10, 0); + frame_drop_ratio = gtk_spin_button_new (GTK_ADJUSTMENT (frame_drop_ratio_adj), 1, 0); + gtk_widget_show (frame_drop_ratio); + gtk_table_attach (GTK_TABLE (table12), frame_drop_ratio, 1, 2, 0, 1, +@@ -642,7 +642,7 @@ create_window1 (void) + gtk_misc_set_alignment (GTK_MISC (bquant_min_max_label), 0, 0.5); + gtk_misc_set_padding (GTK_MISC (bquant_min_max_label), 2, 5); + +- min_iquant_adj = gtk_adjustment_new (2, 1, 31, 1, 10, 10); ++ min_iquant_adj = gtk_adjustment_new (2, 1, 31, 1, 10, 0); + min_iquant = gtk_spin_button_new (GTK_ADJUSTMENT (min_iquant_adj), 1, 0); + gtk_widget_show (min_iquant); + gtk_table_attach (GTK_TABLE (table4), min_iquant, 1, 2, 1, 2, +@@ -650,7 +650,7 @@ create_window1 (void) + (GtkAttachOptions) (0), 2, 2); + gtk_tooltips_set_tip (tooltips, min_iquant, "Minimum I-Frame Quantizer", NULL); + +- min_pquant_adj = gtk_adjustment_new (2, 1, 31, 1, 10, 10); ++ min_pquant_adj = gtk_adjustment_new (2, 1, 31, 1, 10, 0); + min_pquant = gtk_spin_button_new (GTK_ADJUSTMENT (min_pquant_adj), 1, 0); + gtk_widget_show (min_pquant); + gtk_table_attach (GTK_TABLE (table4), min_pquant, 1, 2, 2, 3, +@@ -658,7 +658,7 @@ create_window1 (void) + (GtkAttachOptions) (0), 2, 2); + gtk_tooltips_set_tip (tooltips, min_pquant, "Minimum P-Frame Quantizer", NULL); + +- min_bquant_adj = gtk_adjustment_new (2, 1, 31, 1, 10, 10); ++ min_bquant_adj = gtk_adjustment_new (2, 1, 31, 1, 10, 0); + min_bquant = gtk_spin_button_new (GTK_ADJUSTMENT (min_bquant_adj), 1, 0); + gtk_widget_show (min_bquant); + gtk_table_attach (GTK_TABLE (table4), min_bquant, 1, 2, 3, 4, +@@ -666,7 +666,7 @@ create_window1 (void) + (GtkAttachOptions) (0), 2, 2); + gtk_tooltips_set_tip (tooltips, min_bquant, "Minimum B-Frame Quantizer", NULL); + +- max_iquant_adj = gtk_adjustment_new (31, 1, 31, 1, 10, 10); ++ max_iquant_adj = gtk_adjustment_new (31, 1, 31, 1, 10, 0); + max_iquant = gtk_spin_button_new (GTK_ADJUSTMENT (max_iquant_adj), 1, 0); + gtk_widget_show (max_iquant); + gtk_table_attach (GTK_TABLE (table4), max_iquant, 2, 3, 1, 2, +@@ -674,7 +674,7 @@ create_window1 (void) + (GtkAttachOptions) (0), 2, 2); + gtk_tooltips_set_tip (tooltips, max_iquant, "Maximum I-Frame Quantizer", NULL); + +- max_pquant_adj = gtk_adjustment_new (31, 1, 31, 1, 10, 10); ++ max_pquant_adj = gtk_adjustment_new (31, 1, 31, 1, 10, 0); + max_pquant = gtk_spin_button_new (GTK_ADJUSTMENT (max_pquant_adj), 1, 0); + gtk_widget_show (max_pquant); + gtk_table_attach (GTK_TABLE (table4), max_pquant, 2, 3, 2, 3, +@@ -682,7 +682,7 @@ create_window1 (void) + (GtkAttachOptions) (0), 2, 2); + gtk_tooltips_set_tip (tooltips, max_pquant, "Maximum I-Frame Quantizer", NULL); + +- max_bquant_adj = gtk_adjustment_new (31, 1, 31, 1, 10, 10); ++ max_bquant_adj = gtk_adjustment_new (31, 1, 31, 1, 10, 0); + max_bquant = gtk_spin_button_new (GTK_ADJUSTMENT (max_bquant_adj), 1, 0); + gtk_widget_show (max_bquant); + gtk_table_attach (GTK_TABLE (table4), max_bquant, 2, 3, 3, 4, +@@ -952,7 +952,7 @@ create_window1 (void) + gtk_misc_set_alignment (GTK_MISC (label64), 0, 0.5); + gtk_misc_set_padding (GTK_MISC (label64), 2, 5); + +- curve_compression_high_adj = gtk_adjustment_new (0, 0, 100, 1, 10, 10); ++ curve_compression_high_adj = gtk_adjustment_new (0, 0, 100, 1, 10, 0); + curve_compression_high = gtk_spin_button_new (GTK_ADJUSTMENT (curve_compression_high_adj), 1, 0); + gtk_widget_show (curve_compression_high); + gtk_table_attach (GTK_TABLE (table9), curve_compression_high, 1, 2, 2, 3, +@@ -960,7 +960,7 @@ create_window1 (void) + (GtkAttachOptions) (0), 0, 0); + gtk_tooltips_set_tip (tooltips, curve_compression_high, "This settigs control how much the upper part of the curve has to get closer to the average bitrate value. The upper part of the curve is the set of values that are higher than the curve average. It is expressed in %.\n\nThink of that setting like a shrinking factor for the upper part of the curve.", NULL); + +- curve_compression_low_adj = gtk_adjustment_new (0, 0, 100, 1, 10, 10); ++ curve_compression_low_adj = gtk_adjustment_new (0, 0, 100, 1, 10, 0); + curve_compression_low = gtk_spin_button_new (GTK_ADJUSTMENT (curve_compression_low_adj), 1, 0); + gtk_widget_show (curve_compression_low); + gtk_table_attach (GTK_TABLE (table9), curve_compression_low, 1, 2, 3, 4, +@@ -992,7 +992,7 @@ create_window1 (void) + gtk_tooltips_set_tip (tooltips, container_frame_overhead, "Most of the time users express their target bitrate for video w/o taking care of the video container overhead. This small but (mostly) constant overhead can make the target file size is not respected (oversized result). We decided to allow users to set the amount of overhead per frame the container generates (give only an average per frame)\n\nValue = >=0\nDefault = 24 (AVI frame average overhead per frame in bytes)\n0 has a special meaning, it lets XviD uses its own default values", NULL); + gtk_entry_set_text (GTK_ENTRY (container_frame_overhead), "24"); + +- keyframe_boost_adj = gtk_adjustment_new (0, 0, 100, 1, 10, 10); ++ keyframe_boost_adj = gtk_adjustment_new (0, 0, 100, 1, 10, 0); + keyframe_boost = gtk_spin_button_new (GTK_ADJUSTMENT (keyframe_boost_adj), 1, 0); + gtk_widget_show (keyframe_boost); + gtk_table_attach (GTK_TABLE (table9), keyframe_boost, 1, 2, 0, 1, +@@ -1000,7 +1000,7 @@ create_window1 (void) + (GtkAttachOptions) (0), 0, 0); + gtk_tooltips_set_tip (tooltips, keyframe_boost, "This setting tells how many additional amount of bits, Intra Frames are supposed to be given (this \"bossting\" amount of bits is compensated by subtracting the same amount of bits from other frame types pool) \n\nValue = [0..100]", NULL); + +- bitrate_payback_delay_adj = gtk_adjustment_new (5, 0, 100, 1, 10, 10); ++ bitrate_payback_delay_adj = gtk_adjustment_new (5, 0, 100, 1, 10, 0); + bitrate_payback_delay = gtk_spin_button_new (GTK_ADJUSTMENT (bitrate_payback_delay_adj), 1, 0); + gtk_widget_show (bitrate_payback_delay); + gtk_table_attach (GTK_TABLE (table9), bitrate_payback_delay, 1, 2, 1, 2, +@@ -1008,7 +1008,7 @@ create_window1 (void) + (GtkAttachOptions) (0), 0, 0); + gtk_tooltips_set_tip (tooltips, bitrate_payback_delay, "During two pass, a scaled bitrate curve is computed. The difference between that expected curve and the result obtained during encoding is called overflow. Obviously, the two pass Rate Controller tries to compensate that overflow distributing it over next frames to be encoded. \nThis setting controls how much overflow is distributed at each new frame. Low values allow lazy overflow control, big rate bursts are compensated more slowly (could lead to lack of precision for small clips). High values make RC compensate very hard the overflow, this can have a very bad impact on quality during rate bursts. \nNB: This setting impacts quality a lot, play with it carefully!", NULL); + +- max_overflow_improvement_adj = gtk_adjustment_new (5, 0, 100, 1, 10, 10); ++ max_overflow_improvement_adj = gtk_adjustment_new (5, 0, 100, 1, 10, 0); + max_overflow_improvement = gtk_spin_button_new (GTK_ADJUSTMENT (max_overflow_improvement_adj), 1, 0); + gtk_widget_show (max_overflow_improvement); + gtk_table_attach (GTK_TABLE (table9), max_overflow_improvement, 1, 2, 4, 5, +@@ -1016,7 +1016,7 @@ create_window1 (void) + (GtkAttachOptions) (0), 0, 0); + gtk_tooltips_set_tip (tooltips, max_overflow_improvement, "During the frame bit allocation, overflow control may increase the frame size. This parameter controls how much the overflow control is allowed to increase the frame size in percent compared to the ideal curve allocation", NULL); + +- max_overflow_degradation_adj = gtk_adjustment_new (5, 0, 100, 1, 10, 10); ++ max_overflow_degradation_adj = gtk_adjustment_new (5, 0, 100, 1, 10, 0); + max_overflow_degradation = gtk_spin_button_new (GTK_ADJUSTMENT (max_overflow_degradation_adj), 1, 0); + gtk_widget_show (max_overflow_degradation); + gtk_table_attach (GTK_TABLE (table9), max_overflow_degradation, 1, 2, 5, 6, --- xvid4conf-1.12.orig/debian/patches/series +++ xvid4conf-1.12/debian/patches/series @@ -0,0 +1 @@ +01_GtkSpinButton.diff --- xvid4conf-1.12.orig/debian/rules +++ xvid4conf-1.12/debian/rules @@ -0,0 +1,10 @@ +#!/usr/bin/make -f + +export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed +export DEB_BUILD_MAINT_OPTIONS = hardening=+all + +%: + dh $@ --with quilt + +override_dh_builddeb: + dh_builddeb -- -Zxz --- xvid4conf-1.12.orig/debian/source/format +++ xvid4conf-1.12/debian/source/format @@ -0,0 +1 @@ +1.0 --- xvid4conf-1.12.orig/debian/watch +++ xvid4conf-1.12/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://tibit.org/hacks/xvid4conf-(.*).tar.gz \ No newline at end of file