cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove FAAC linkage due to license conflicts.

Browse Source 
Remove a patch for FAAD which is already disabled.

From brad with a note in README from myself.

OK sthen@
This commit is contained in:
edd 2011-06-27 23:29:20 +00:00
parent 299d2faa2e
commit 1e48d3e25a
3 changed files with 11 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
x11/mplayer/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.189 2011/06/25 14:15:42 edd Exp $
# $OpenBSD: Makefile,v 1.190 2011/06/27 23:29:20 edd Exp $
# May not be hard to add more.
ONLY_FOR_ARCHS = alpha amd64 arm i386 mips64 mips64el powerpc sparc64
@ -13,7 +13,7 @@ SUBST_VARS += PREFIX CONFDIR
# Distfiles must be hand-rolled, see README
N = mplayer
DISTNAME = mplayer-${V}
REVISION = 6
REVISION = 7
CATEGORIES = x11 multimedia
@ -27,7 +27,7 @@ PERMIT_DISTFILES_FTP = Yes
WANTLIB = GL X11 Xext Xinerama Xss Xv Xxf86dga Xxf86vm ass avcodec \
avformat avutil bz2 c cdda_interface cdda_paranoia \
crypto dv enca faac fontconfig freetype fribidi gsm jpeg lcms \
crypto dv enca fontconfig freetype fribidi gsm jpeg lcms \
m mng mp3lame ncurses ogg>=5 orc-0.4 png postproc \
pthread SDL schroedinger-1.0>=2.0 sndio speex stdc++ \
swscale theoradec theoraenc ungif util vpx x264>=5 \
@ -55,7 +55,6 @@ LIB_DEPENDS = graphics/png \
graphics/libmng \
archivers/bzip2 \
multimedia/schroedinger>=1.0.10 \
audio/faac \
multimedia/x264>=20101023 \
devel/sdl>=1.2.5 \
multimedia/libass
@ -132,6 +131,8 @@ CONFIGURE_ARGS += --disable-smb \
--disable-libopenjpeg \
--disable-mpg123 \
--disable-librtmp \
--disable-faac \
--disable-faac-lavc \
--disable-faad \
--disable-theora

7
x11/mplayer/README
View File

@ -1,4 +1,4 @@
$OpenBSD: README,v 1.1 2011/03/29 20:04:41 edd Exp $
$OpenBSD: README,v 1.2 2011/06/27 23:29:20 edd Exp $
Porting notes for MPlayer
=========================
@ -33,6 +33,11 @@ Be aware that some hardware lacks a floating point unit (ARM for
example). On these architectures, you should select integer decoders
where possible. Eg. Tremor instead of Vorbis.
External FAAC linkage (and multimedia/ffmpeg's external FAAC linkage)
was disabled due to conflicting licenses. Only the FFMPEG's
internal "ffaac" encoder remains for use with encoding AAC in mencoder.
https://bugs.launchpad.net/ubuntu/+source/faac/+bug/374900
FFMPEG OGG Demuxer Bug
----------------------

30
x11/mplayer/patches/patch-libmpcodecs_ad_faad_c
View File

@ -1,30 +0,0 @@
$OpenBSD: patch-libmpcodecs_ad_faad_c,v 1.6 2011/03/29 20:04:41 edd Exp $
--- libmpcodecs/ad_faad.c.orig Sat Jan 1 14:27:41 2011
+++ libmpcodecs/ad_faad.c Mon Jan 31 14:18:31 2011
@@ -79,7 +79,7 @@ static int aac_probe(unsigned char *buffer, int len)
static int init(sh_audio_t *sh)
{
- unsigned long faac_samplerate;
+ unsigned int faac_samplerate;
unsigned char faac_channels;
int faac_init, pos = 0;
faac_hdec = faacDecOpen();
@@ -171,7 +171,7 @@ static int init(sh_audio_t *sh)
return 0;
} else {
mp_msg(MSGT_DECAUDIO,MSGL_V,"FAAD: Decoder init done (%dBytes)!\n", sh->a_in_buffer_len); // XXX: remove or move to debug!
- mp_msg(MSGT_DECAUDIO,MSGL_V,"FAAD: Negotiated samplerate: %ldHz channels: %d\n", faac_samplerate, faac_channels);
+ mp_msg(MSGT_DECAUDIO,MSGL_V,"FAAD: Negotiated samplerate: %dHz channels: %d\n", faac_samplerate, faac_channels);
// 8 channels is aac channel order #7.
sh->channels = faac_channels == 7 ? 8 : faac_channels;
if (audio_output_channels <= 2) sh->channels = faac_channels > 1 ? 2 : 1;
@@ -301,7 +301,7 @@ static int decode_audio(sh_audio_t *sh,unsigned char *
} else {
/* XXX: samples already multiplied by channels! */
mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"FAAD: Successfully decoded frame (%ld Bytes)!\n",
- sh->samplesize*faac_finfo.samples);
+ (long)sh->samplesize*faac_finfo.samples);
if (sh->channels >= 5)
reorder_channel_copy_nch(faac_sample_buffer,