Bug#823589: mplayer: Please create dummy package for upgrades from jessie

2016-05-10 Thread Adam Conrad
Package: mplayer
Version: 2:1.3.0-1
Followup-For: Bug #823589
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu yakkety ubuntu-patch



In Ubuntu, the attached patch was applied to achieve the following:

  * Add mplayer2 transitional package to fix upgrades (LP: #1580268)

So, I noticed after fixing this in Ubuntu that you fixed it in Debian
git 48 hours ago.  Your fix is, however, incomplete (notice the extra
parts of my diff that aren't included in your commit, where I version
the Replaces, and change the Conflict to a versioned Breaks).

It would be lovely if you swapped in my fix for yours (at least the
missing bits).

... Adam

-- System Information:
Debian Release: stretch/sid
  APT prefers yakkety
  APT policy: (500, 'yakkety')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.4.0-21-lowlatency (SMP w/4 CPU cores; PREEMPT)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru mplayer-1.3.0/debian/control mplayer-1.3.0/debian/control
--- mplayer-1.3.0/debian/control	2016-04-17 13:14:24.0 -0600
+++ mplayer-1.3.0/debian/control	2016-05-10 11:57:44.0 -0600
@@ -147,6 +147,16 @@
  (1 or 2 passes), libavcodec, PCM/MP3/VBRMP3 audio. Also has stream
  copying and video resizing capabilities.
 
+# This can be dropped after yakkety/stretch release, whichever is later:
+Package: mplayer2
+Section: oldlibs
+Architecture: all
+Multi-Arch: foreign
+Depends: mplayer (>= 2:1.2)
+Description: transitional package from mplayer2 to mplayer
+ This package exists to upgrade mplayer2 users to mplayer; it can be safely
+ removed once the upgrade has been performed.
+
 Package: mplayer
 Architecture: any
 Multi-Arch: foreign
@@ -163,9 +173,9 @@
  mencoder (<< 2:1.0~rc3+svn20090426-2),
  mplayer-doc (<< 2:1.0~rc3+svn20090426-2),
  mplayer-nogui (<< 2:1.0~rc3+svn20090426-2),
- mplayer2
-Conflicts:
- mplayer2
+ mplayer2 (<< 2:1.2)
+Breaks:
+ mplayer2 (<< 2:1.2)
 Description: movie player for Unix-like systems
  MPlayer plays most MPEG, VOB, AVI, Ogg/OGM, VIVO,
  ASF/WMA/WMV, QT/MOV/MP4, FLI, RM, NuppelVideo, yuv4mpeg, FILM, RoQ, PVA files,
___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers

Bug#742371: Please add aarch64/arm64 to the 64-bit patch (patch attached)

2014-03-22 Thread Adam Conrad
Package: blender
Version: 2.69-4
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu trusty ubuntu-patch



In Ubuntu, the attached patch was applied to achieve the following:

  * Add aarch64 to 0012-fix_FTBFS_on_unofficial_64bit_archs.patch for arm64.

Do note that __aarch64__ (ARM's ARMv8) and __arch64__ (the macro used
to detect 64-bit on __sparc__) are not the same thing, you do need both
as my patch has here.  This has confused many people in the past. ;)

... Adam

-- System Information:
Debian Release: jessie/sid
  APT prefers trusty-updates
  APT policy: (500, 'trusty-updates'), (500, 'trusty-security'), (500, 'trusty')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.13.0-17-generic (SMP w/4 CPU cores)
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru blender-2.69/debian/patches/0012-fix_FTBFS_on_unofficial_64bit_archs.patch blender-2.69/debian/patches/0012-fix_FTBFS_on_unofficial_64bit_archs.patch
--- blender-2.69/debian/patches/0012-fix_FTBFS_on_unofficial_64bit_archs.patch	2014-02-17 04:21:23.0 -0700
+++ blender-2.69/debian/patches/0012-fix_FTBFS_on_unofficial_64bit_archs.patch	2014-03-22 15:34:33.0 -0600
@@ -15,7 +15,7 @@
  #endif
  
 -#if defined(_M_X64) || defined(__amd64__) || defined(__x86_64__)
-+#if defined(_M_X64) || defined(__amd64__) || defined(__x86_64__) || defined(__s390x__) || defined(__powerpc64__) || (defined(__sparc__)  defined(__arch64__))
++#if defined(_M_X64) || defined(__amd64__) || defined(__x86_64__) || defined(__s390x__) || defined(__powerpc64__) || defined(__aarch64__) || (defined(__sparc__)  defined(__arch64__))
  #  define LG_SIZEOF_PTR 3
  #  define LG_SIZEOF_INT 2
  #else
___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers

Bug#730308: x42-plugins: FTBFS: cc1: error: unrecognized command line option '-msse'

2013-11-24 Thread Adam Conrad
Package: x42-plugins
Version: 20131119-2
Followup-For: Bug #730308
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu trusty ubuntu-patch



In Ubuntu, the attached patch was applied to achieve the following:

  * debian/patches/01-remove-sse.patch: Remove SSE flags a bit harder.

The patch should be self-explanatory.  Cheers.

... Adam

-- System Information:
Debian Release: wheezy/sid
  APT prefers trusty-updates
  APT policy: (500, 'trusty-updates'), (500, 'trusty-security'), (500, 
'trusty'), (500, 'saucy-updates')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.11.0-13-generic (SMP w/4 CPU cores)
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru x42-plugins-20131119/debian/changelog x42-plugins-20131119/debian/changelog
diff -Nru x42-plugins-20131119/debian/patches/01-remove-sse.patch x42-plugins-20131119/debian/patches/01-remove-sse.patch
--- x42-plugins-20131119/debian/patches/01-remove-sse.patch	2013-11-24 02:32:53.0 -0700
+++ x42-plugins-20131119/debian/patches/01-remove-sse.patch	2013-11-24 10:36:02.0 -0700
@@ -87,7 +87,7 @@
  #!/usr/bin/make -f
  
 -OPTIMIZATIONS ?= -msse -msse2 -mfpmath=sse -ffast-math -fomit-frame-pointer -O3 -fno-finite-math-only
-+OPTIMIZATIONS ?= -mfpmath=sse -ffast-math -fomit-frame-pointer -O3 -fno-finite-math-only
++OPTIMIZATIONS ?= -ffast-math -fomit-frame-pointer -O3 -fno-finite-math-only
  PREFIX ?= /usr/local
  CFLAGS ?= -g -Wall -Wno-unused-function
  LIBDIR ?= lib
___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers

Bug#693419: libltc: FTBFS on PowerPC due to misnamed member name in LTCFrame struct

2012-11-16 Thread Adam Conrad
Package: libltc
Version: 1.0.3-1
Severity: serious
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu raring ubuntu-patch


The attached patch should be fairly self-evident, I hope.  This
fixes the FTBFS on PowerPC (and fixes a bug in general on all
big-endian arches, though some may be failing for other reasons
as well).

... Adam

-- System Information:
Debian Release: wheezy/sid
  APT prefers raring-updates
  APT policy: (500, 'raring-updates'), (500, 'raring-security'), (500, 
'raring'), (500, 'quantal-updates')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.5.0-18-generic (SMP w/4 CPU cores)
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru libltc-1.0.3/debian/patches/big_endian_ftbfs.patch libltc-1.0.3/debian/patches/big_endian_ftbfs.patch
--- libltc-1.0.3/debian/patches/big_endian_ftbfs.patch	1969-12-31 17:00:00.0 -0700
+++ libltc-1.0.3/debian/patches/big_endian_ftbfs.patch	2012-11-16 02:06:16.0 -0700
@@ -0,0 +1,15 @@
+Description: Fix member name in big-endian version of LTCFrame
+Author: Adam Conrad adcon...@ubuntu.com
+Forwarded: no
+
+--- libltc-1.0.3.orig/src/ltc.h
 libltc-1.0.3/src/ltc.h
+@@ -127,7 +127,7 @@ struct LTCFrame {
+ 	unsigned int frame_units:4;
+ 
+ 	unsigned int user2:4;
+-	unsigned int col_frm:1;
++	unsigned int col_frame:1;
+ 	unsigned int dfbit:1;
+ 	unsigned int frame_tens:2;
+ 
diff -Nru libltc-1.0.3/debian/patches/series libltc-1.0.3/debian/patches/series
--- libltc-1.0.3/debian/patches/series	1969-12-31 17:00:00.0 -0700
+++ libltc-1.0.3/debian/patches/series	2012-11-16 02:05:24.0 -0700
@@ -0,0 +1 @@
+big_endian_ftbfs.patch
___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers

Bug#678718: unicap: implicit pointer conversions due to missing function prototypes

2012-06-23 Thread Adam Conrad
Source: unicap
Version: 0.9.12-1
Severity: important
Justification: causes segfaults on most non-32-bit arches

Hi, the Ubuntu amd64 buildd spotted an implicit pointer conversion
issue with your package[1].  Turns out, on closer inspection, that
several source files seem to be macroing to libv4l2 functions
without including the libv4l2.h header.  I'll follow up with a
patch once debbugs gives me a bug number to reference. ;)

... Adam

[1] 
https://launchpadlibrarian.net/108424349/buildlog_ubuntu-quantal-amd64.unicap_0.9.12-1_FAILEDTOBUILD.txt.gz



___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers


Bug#678718: unicap: implicit pointer conversions due to missing function prototypes

2012-06-23 Thread Adam Conrad
Attached is a debdiff containing two patches:

1010_libv4l2.h_includes.patch:
  fixes the implicit declarations that directly cause this bug
1011_euvccam_implicit_decls.patch
  fixes the remaining implicit declarations in the source

... Adam

diff -Nru unicap-0.9.12/debian/changelog unicap-0.9.12/debian/changelog
--- unicap-0.9.12/debian/changelog  2012-06-22 19:25:20.0 -0600
+++ unicap-0.9.12/debian/changelog  2012-06-23 18:39:44.0 -0600
@@ -1,3 +1,11 @@
+unicap (0.9.12-2) unstable; urgency=low
+
+  * Fix implicit pointer conversions by including libv4l2.h so we
+have its prototypes available to our macros (closes: #678718)
+  * Fix up more implicit function declarations in cpi/euvccam too.
+
+ -- Adam Conrad adcon...@debian.org  Sat, 23 Jun 2012 18:39:04 -0600
+
 unicap (0.9.12-1) unstable; urgency=low
 
   * New upstream release.
diff -Nru unicap-0.9.12/debian/patches/1010_libv4l2.h_includes.patch 
unicap-0.9.12/debian/patches/1010_libv4l2.h_includes.patch
--- unicap-0.9.12/debian/patches/1010_libv4l2.h_includes.patch  1969-12-31 
17:00:00.0 -0700
+++ unicap-0.9.12/debian/patches/1010_libv4l2.h_includes.patch  2012-06-23 
18:39:56.0 -0600
@@ -0,0 +1,47 @@
+Description: Fix implicit pointer conversions in v4l2 macros
+  Fix implicit pointer conversions by including libv4l2.h so we
+  have its prototypes available to our macros (closes: #678718)
+Author: Adam Conrad adcon...@debian.org
+Bug-Debian: http://bugs.debian.org/678718
+Forwarded: no
+Last-Update: 2012-06-23
+
+--- unicap-0.9.12.orig/cpi/v4l2cpi/tiseuvccam.c
 unicap-0.9.12/cpi/v4l2cpi/tiseuvccam.c
+@@ -28,6 +28,10 @@
+ #define DEBUG
+ #endif
+ 
++#if USE_LIBV4L
++#include libv4l2.h
++#endif
++
+ #define TRUE 1
+ 
+ #include debug.h
+--- unicap-0.9.12.orig/cpi/v4l2cpi/tisuvccam.c
 unicap-0.9.12/cpi/v4l2cpi/tisuvccam.c
+@@ -22,6 +22,10 @@
+ #endif
+ #include debug.h
+ 
++#if USE_LIBV4L
++#include libv4l2.h
++#endif
++
+ #define N_(x) x
+ 
+ #define FOURCC(a,b,c,d) (unsigned int)unsigned int)d)24)+(((unsigned 
int)c)16)+(((unsigned int)b)8)+a)
+--- unicap-0.9.12.orig/cpi/v4l2cpi/buffermanager.c
 unicap-0.9.12/cpi/v4l2cpi/buffermanager.c
+@@ -13,6 +13,10 @@
+ #endif
+ #include debug.h
+ 
++#if USE_LIBV4L
++#include libv4l2.h
++#endif
++
+ #include buffermanager.h
+ 
+ #define MAX_BUFFERS 16
diff -Nru unicap-0.9.12/debian/patches/1011_euvccam_implicit_decls.patch 
unicap-0.9.12/debian/patches/1011_euvccam_implicit_decls.patch
--- unicap-0.9.12/debian/patches/1011_euvccam_implicit_decls.patch  
1969-12-31 17:00:00.0 -0700
+++ unicap-0.9.12/debian/patches/1011_euvccam_implicit_decls.patch  
2012-06-23 18:54:11.0 -0600
@@ -0,0 +1,47 @@
+Description: Fix up implicit function declarations in cpi/euvccam.
+Author: Adam Conrad adcon...@debian.org
+Forwarded: no
+Last-Update: 2012-06-23
+
+--- unicap-0.9.12.orig/cpi/euvccam/euvccam_cpi.h
 unicap-0.9.12/cpi/euvccam/euvccam_cpi.h
+@@ -35,7 +35,7 @@
+ #include debug.h
+ 
+ #include euvccam_usb.h
+-
++#include logging.h
+ 
+ struct euvccam_handle
+ {
+--- unicap-0.9.12.orig/cpi/euvccam/logging.c
 unicap-0.9.12/cpi/euvccam/logging.c
+@@ -21,6 +21,7 @@
+ #include stdlib.h
+ #include stdio.h
+ #include stdarg.h
++#include string.h
+ 
+ FILE *g_logfp = NULL;
+ int g_log_modules_mask = 0x;
+--- unicap-0.9.12.orig/cpi/euvccam/euvccam_usb.c
 unicap-0.9.12/cpi/euvccam/euvccam_usb.c
+@@ -26,6 +26,7 @@
+ #include unicap.h
+ #include stdint.h
+ #include string.h
++#include stdio.h
+ #include linux/usbdevice_fs.h
+ 
+ #include unicap.h
+--- unicap-0.9.12.orig/cpi/euvccam/euvccam_colorproc.c
 unicap-0.9.12/cpi/euvccam/euvccam_colorproc.c
+@@ -18,6 +18,8 @@
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  */
+ 
++#include string.h
++
+ #include euvccam_cpi.h
+ #include debayer.h
+ 
diff -Nru unicap-0.9.12/debian/patches/series 
unicap-0.9.12/debian/patches/series
--- unicap-0.9.12/debian/patches/series 2012-06-22 17:13:05.0 -0600
+++ unicap-0.9.12/debian/patches/series 2012-06-23 18:53:27.0 -0600
@@ -3,3 +3,5 @@
 1005_tidy_gettext.patch
 1006_fix_euvccam_rt_linage.patch
 1009_v4l1.patch
+1010_libv4l2.h_includes.patch
+1011_euvccam_implicit_decls.patch
___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers