diff options
| author | Juergen Lock <nox@FreeBSD.org> | 2012-02-26 15:22:37 +0000 |
|---|---|---|
| committer | Juergen Lock <nox@FreeBSD.org> | 2012-02-26 15:22:37 +0000 |
| commit | d613b75b1d87505cc967bc6f8b7a419b2d57be5b (patch) | |
| tree | fb8dfa0620864eed2a359680644745507734b86a /multimedia/libxine/files/patch-src:libffmpeg:libavcodec:h263.c | |
| parent | - Upgrade to 3.1.2. (diff) | |
- Update multimedia/libxine to 1.2.1 with a commit merged from hg
to fix DVB support. (which still is broken for tuners using
hardware pid filtering, like when running webcamd with
"-m dvb-usb-init.force_pid_filter_usage=1".)
- Add patches to fix build of ports depending on libxine to:
audio/amarok,
graphics/gimageview [1], graphics/pornview [1],
graphics/osg [2], graphics/osg-devel [2],
multimedia/emotion,
x11/kdelibs4 [3],
multimedia/kmplayer,
multimedia/konverter,
multimedia/qdvdauthor [4],
multimedia/vdr-plugin-xineliboutput,
multimedia/xfce4-media [5],
multimedia/xine_artsplugin,
multimedia/k9copy-kde4 [6]
- Fix RUN_DEPENDS= xine... which should be LIB_DEPENDS for audio/atunes . [7]
- Mark multimedia/phonon-xine BROKEN which refuses to build with
libxine 1.2.x and is deprecated upstream. [3]
- Disable XINE knob for x11/eaglemode for which I don't have a fix. [2]
- Note: multimedia/kaffeine runs after rakuco's x11/kdelibs4 fix,
but it only shows a green window at least with mp4 or ts files.
(avi files and audio still work.) It seems the kaffeine developers
have found this too and are now switching away from libxine in
their git repo - so I guess we'll have a broken kaffeine at least
until they release a new version.
- Bump PORTREVISIONs for ports depending on libxine by default.
- Add optional libbluray support to multimedia/libxine and
multimedia/vdr-plugin-xineliboutput.
PR: ports/165057 [6]
Submitted by: nox (self) [6], rakuco [3]
Approved by: dinoex (maintainer, via irc) [1],
amdmi3 (maintainer, via private email) [2],
kde@ (rakuco, via irc) [3],
Phil Oleson <oz@nixil.net> (maintainer, via private email) [4],
xfce@ (rene, via irc) [5],
Eduardo Gielamo Oliveira <egoliveira@gmail.com> (maintainer) [6],
lme (maintainer, via irc) [7]
Thanx to: Darren Salt (upstream libxine maintainer) for a few
hints on irc to help with patching ports depending
on deprecated libxine features
Notes
Notes:
svn path=/head/; revision=292268
Diffstat (limited to 'multimedia/libxine/files/patch-src:libffmpeg:libavcodec:h263.c')
| -rw-r--r-- | multimedia/libxine/files/patch-src:libffmpeg:libavcodec:h263.c | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:h263.c b/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:h263.c deleted file mode 100644 index b6577c5bae57..000000000000 --- a/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:h263.c +++ /dev/null @@ -1,39 +0,0 @@ ---- src/libffmpeg/libavcodec/h263.c.orig Sun Jul 9 16:38:11 2006 -+++ src/libffmpeg/libavcodec/h263.c Thu Sep 28 12:53:39 2006 -@@ -38,6 +38,7 @@ - #include "mpegvideo.h" - #include "h263data.h" - #include "mpeg4data.h" -+#include "xine_internal.h" - - //#undef NDEBUG - //#include <assert.h> -@@ -66,8 +67,8 @@ - static int h263p_decode_umotion(MpegEncContext * s, int pred); - static int h263_decode_block(MpegEncContext * s, DCTELEM * block, - int n, int coded); --static inline int mpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr); --static inline int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block, -+static int __inline mpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr); -+static int __inline mpeg4_decode_block(MpegEncContext * s, DCTELEM * block, - int n, int coded, int intra, int rvlc); - static int mpeg4_get_block_length(MpegEncContext * s, DCTELEM * block, int n, int intra_dc, - uint8_t *scan_table); -@@ -4684,7 +4685,7 @@ - * @param dir_ptr the prediction direction will be stored here - * @return the quantized dc - */ --static inline int mpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr) -+static __inline int mpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr) - { - int level, code; - -@@ -4729,7 +4730,7 @@ - * decodes a block. - * @return <0 if an error occured - */ --static inline int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block, -+static __inline int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block, - int n, int coded, int intra, int rvlc) - { - int level, i, last, run; |
