Source: mplayer
Followup-For: Bug #726838
Hi all,
I've made some fixes to help package building.
libav-compat.diff: adds system libav compatibility
Unfortunately the mplayer code is not enough clean to build using
system include so there is a catch.
I've removed local ffmpeg from includes (in configure), but some files
require libavutil/x86_cpu.h
A trick can be add a local patch that adds this file
on topdir (this file only). It's not pretty but the alternative
is change a lot of files.
live555-async.diff: async interface for live555
A patch I've made some time ago that mimic async code (like live555 did)
I've noticed some problems in live555 after they removed the sync interface.
Applying this patch to an old snapshot of live555 with
sync code behaves exactly as using the old live555 code and does not
expose the problem(s).
control.diff: for new deps
libjack-dev - libjack-dev | libjack-jackd2-dev
libmpcdec-dev - deprecated not enabled by default (decoder in libav?)
libschroedinger-dev - needs ffmpeg static
libsvga1-dev - removed from debian
debian/control and debian/rules
libsmbclient-dev - detection is broken, configure needs to use pkg-config
(in sid the include is in /usr/include/samba-4.0/libsmbclient.h)
libaudio-dev ? nas audio system, really used?
libdts-dev - it's better to use libdca-dev, mplayer uses it anyway
the install rule for png files need to be revised, now mplayer
has 16 22 24 32 48 256 png
Hope it helps
Regards
-- System Information:
Debian Release: jessie/sid
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)
Kernel: Linux 3.2.0-4-amd64 (SMP w/8 CPU cores)
Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968)
Shell: /bin/sh linked to /bin/bash
diff -ur -xdebian mplayer-1.1.1.orig/av_opts.c mplayer-1.1.1/av_opts.c
--- mplayer-1.1.1.orig/av_opts.c 2012-01-28 14:51:57.0 +0100
+++ mplayer-1.1.1/av_opts.c 2013-12-24 06:49:16.0 +0100
@@ -42,7 +42,7 @@
arg = strchr(str, '=');
if(arg) *arg++= 0;
-if(av_set_string3(v, str, arg, 0, NULL) 0){
+if (av_opt_set(v, str, arg, 0) 0) {
free(start);
return -1;
}
diff -ur -xdebian mplayer-1.1.1.orig/bstr.c mplayer-1.1.1/bstr.c
--- mplayer-1.1.1.orig/bstr.c 2010-07-19 00:00:48.0 +0200
+++ mplayer-1.1.1/bstr.c 2013-12-24 06:49:16.0 +0100
@@ -18,6 +18,7 @@
#include string.h
#include libavutil/avutil.h
+#include libavutil/common.h
#include bstr.h
diff -ur -xdebian mplayer-1.1.1.orig/codec-cfg.c mplayer-1.1.1/codec-cfg.c
--- mplayer-1.1.1.orig/codec-cfg.c 2012-05-08 12:56:22.0 +0200
+++ mplayer-1.1.1/codec-cfg.c 2013-12-24 06:49:16.0 +0100
@@ -54,6 +54,7 @@
#include help_mp.h
#include libavutil/avutil.h
+#include libavutil/common.h
#include libmpcodecs/img_format.h
#include codec-cfg.h
diff -ur -xdebian mplayer-1.1.1.orig/configure mplayer-1.1.1/configure
--- mplayer-1.1.1.orig/configure 2012-05-22 20:01:51.0 +0200
+++ mplayer-1.1.1/configure 2013-12-24 06:49:16.0 +0100
@@ -1554,7 +1554,7 @@
fi
fi
-extra_cflags=-I. -Iffmpeg $extra_cflags
+extra_cflags=-I. $extra_cflags
extra_ldflags=-lm $extra_ldflags
_timer=timer-linux.c
_getch=getch2.c
diff -ur -xdebian mplayer-1.1.1.orig/fmt-conversion.h mplayer-1.1.1/fmt-conversion.h
--- mplayer-1.1.1.orig/fmt-conversion.h 2011-03-01 22:44:15.0 +0100
+++ mplayer-1.1.1/fmt-conversion.h 2013-12-24 06:49:16.0 +0100
@@ -22,6 +22,7 @@
#include config.h
#include libavutil/avutil.h
#include libavutil/samplefmt.h
+#include libavutil/pixfmt.h
enum PixelFormat imgfmt2pixfmt(int fmt);
int pixfmt2imgfmt(enum PixelFormat pix_fmt);
diff -ur -xdebian mplayer-1.1.1.orig/libaf/af_format.c mplayer-1.1.1/libaf/af_format.c
--- mplayer-1.1.1.orig/libaf/af_format.c 2011-10-26 17:12:35.0 +0200
+++ mplayer-1.1.1/libaf/af_format.c 2013-12-24 06:49:16.0 +0100
@@ -34,6 +34,7 @@
#include libvo/fastmemcpy.h
#include libavutil/avutil.h
+#include libavutil/common.h
/* Functions used by play to convert the input audio to the correct
format */
diff -ur -xdebian mplayer-1.1.1.orig/libaf/af_lavcac3enc.c mplayer-1.1.1/libaf/af_lavcac3enc.c
--- mplayer-1.1.1.orig/libaf/af_lavcac3enc.c 2012-02-19 16:21:23.0 +0100
+++ mplayer-1.1.1/libaf/af_lavcac3enc.c 2013-12-24 06:49:16.0 +0100
@@ -34,6 +34,7 @@
#include libavcodec/avcodec.h
#include libavutil/intreadwrite.h
+#include libavutil/common.h
#define AC3_MAX_CHANNELS6
#define AC3_FRAME_SIZE 1536
diff -ur -xdebian mplayer-1.1.1.orig/libmpcodecs/vd_ffmpeg.c mplayer-1.1.1/libmpcodecs/vd_ffmpeg.c
--- mplayer-1.1.1.orig/libmpcodecs/vd_ffmpeg.c 2012-06-02 17:00:52.0 +0200
+++ mplayer-1.1.1/libmpcodecs/vd_ffmpeg.c 2013-12-24 06:49:16.0 +0100
@@ -47,6 +47,18 @@
#include libavcodec/avcodec.h
+#ifndef AV_EF_COMPLIANT
+#define AV_EF_COMPLIANT 0
+#endif
+
+#ifndef AV_EF_CAREFUL
+#define
