diff options
| author |   Olivier Crête <tester@gentoo.org> | 2006-11-18 21:11:19 +0000 |
|---|---|---|
| committer | Olivier Crête <tester@gentoo.org> | 2006-11-18 21:11:19 +0000 |
| commit | 4daad10456cec447cbf65a447d18a96c94858410 (patch) | |
| tree | 5f6a677416d71e4c82a280355309f72a7f7e5429 /media-video/mpeg4ip/files | |
| parent | Fix blackbox dependency. (diff) | |
| download | gentoo-2-4daad10456cec447cbf65a447d18a96c94858410.tar.gz gentoo-2-4daad10456cec447cbf65a447d18a96c94858410.tar.bz2 gentoo-2-4daad10456cec447cbf65a447d18a96c94858410.zip | |
Add const_cast for newer ffmpeg and -lX11 for newer SDL
(Portage version: 2.1.1-r2)
Diffstat (limited to 'media-video/mpeg4ip/files')
| -rw-r--r-- | media-video/mpeg4ip/files/mpeg4ip-1.5.0.1-lX11.patch | 11 | ||||
| -rw-r--r-- | media-video/mpeg4ip/files/mpeg4ip-1.5.0.1-newffmpeg.patch | 22 |
2 files changed, 33 insertions, 0 deletions
diff --git a/media-video/mpeg4ip/files/mpeg4ip-1.5.0.1-lX11.patch b/media-video/mpeg4ip/files/mpeg4ip-1.5.0.1-lX11.patch new file mode 100644 index 000000000000..874c6a39c214 --- /dev/null +++ b/media-video/mpeg4ip/files/mpeg4ip-1.5.0.1-lX11.patch @@ -0,0 +1,11 @@ +--- player/src/Makefile.am.orig 2006-11-18 15:13:56.000000000 -0500 ++++ player/src/Makefile.am 2006-11-18 15:14:24.000000000 -0500 +@@ -206,7 +206,7 @@ + $(top_builddir)/lib/audio/libaudio.la \ + $(top_builddir)/lib/ismacryp/libismacryp.la \ + $(top_builddir)/lib/srtp/libsrtpif.la \ +- @SDL_LIBS@ @SRTPLIB@ ++ @SDL_LIBS@ -lX11 @SRTPLIB@ + + gmp4player_LDFLAGS= $(SDL_AUDIO_FLAGS) + gmp4player_LDADD = $(mp4player_LDADD) \ diff --git a/media-video/mpeg4ip/files/mpeg4ip-1.5.0.1-newffmpeg.patch b/media-video/mpeg4ip/files/mpeg4ip-1.5.0.1-newffmpeg.patch new file mode 100644 index 000000000000..97678d317351 --- /dev/null +++ b/media-video/mpeg4ip/files/mpeg4ip-1.5.0.1-newffmpeg.patch @@ -0,0 +1,22 @@ +--- player/plugin/audio/ffmpeg/ffmpeg.cpp.orig 2006-11-18 12:34:36.000000000 -0500 ++++ player/plugin/audio/ffmpeg/ffmpeg.cpp 2006-11-18 12:34:50.000000000 -0500 +@@ -166,7 +166,7 @@ + break; + } + if (userdata) { +- ffmpeg->m_c->extradata = (void *)userdata; ++ ffmpeg->m_c->extradata = const_cast<uint8_t*>(userdata); + ffmpeg->m_c->extradata_size = ud_size; + } + if (avcodec_open(ffmpeg->m_c, ffmpeg->m_codec) < 0) { +--- player/plugin/video/ffmpeg/ffmpeg.cpp.orig 2006-11-18 14:48:11.000000000 -0500 ++++ player/plugin/video/ffmpeg/ffmpeg.cpp 2006-11-18 14:49:22.000000000 -0500 +@@ -255,7 +255,7 @@ + } + break; + case CODEC_ID_SVQ3: +- ffmpeg->m_c->extradata = (void *)userdata; ++ ffmpeg->m_c->extradata = const_cast<uint8_t*>(userdata); + ffmpeg->m_c->extradata_size = ud_size; + if (vinfo != NULL) { + ffmpeg->m_c->width = vinfo->width; |