diff options
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/ffmpeg/Makefile | 2 | ||||
| -rw-r--r-- | multimedia/ffmpeg/files/patch-libavcodec_Makefile | 12 | ||||
| -rw-r--r-- | multimedia/ffmpeg/files/patch-libavcodec_imgconvert.c | 18 | ||||
| -rw-r--r-- | multimedia/vlc/Makefile.inc | 8 |
4 files changed, 31 insertions, 9 deletions
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index 30ebe348e3fd..8830d0ba6258 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -7,7 +7,7 @@ PORTNAME= ffmpeg DISTVERSION= 2008-07-27 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= ahze diff --git a/multimedia/ffmpeg/files/patch-libavcodec_Makefile b/multimedia/ffmpeg/files/patch-libavcodec_Makefile new file mode 100644 index 000000000000..178aebe3d41a --- /dev/null +++ b/multimedia/ffmpeg/files/patch-libavcodec_Makefile @@ -0,0 +1,12 @@ +--- libavcodec/Makefile.orig 2008-08-14 14:31:06.000000000 -0400 ++++ libavcodec/Makefile 2008-08-14 14:31:16.000000000 -0400 +@@ -373,9 +373,7 @@ OBJS-$(HAVE_W32THREADS) + + + OBJS-$(HAVE_XVMC) += xvmcvideo.o + +-ifndef CONFIG_SWSCALE + OBJS += imgresample.o +-endif + + # processor-specific code + ifdef HAVE_MMX diff --git a/multimedia/ffmpeg/files/patch-libavcodec_imgconvert.c b/multimedia/ffmpeg/files/patch-libavcodec_imgconvert.c new file mode 100644 index 000000000000..426fd546ffd7 --- /dev/null +++ b/multimedia/ffmpeg/files/patch-libavcodec_imgconvert.c @@ -0,0 +1,18 @@ +--- libavcodec/imgconvert.c.orig 2008-08-14 14:31:37.000000000 -0400 ++++ libavcodec/imgconvert.c 2008-08-14 14:31:54.000000000 -0400 +@@ -2108,7 +2108,6 @@ int img_pad(AVPicture *dst, const AVPict + } + #endif + +-#ifndef CONFIG_SWSCALE + static uint8_t y_ccir_to_jpeg[256]; + static uint8_t y_jpeg_to_ccir[256]; + static uint8_t c_ccir_to_jpeg[256]; +@@ -2628,7 +2627,6 @@ int img_convert(AVPicture *dst, int dst_ + avpicture_free(tmp); + return ret; + } +-#endif + + /* NOTE: we scan all the pixels to have an exact information */ + static int get_alpha_info_pal8(const AVPicture *src, int width, int height) diff --git a/multimedia/vlc/Makefile.inc b/multimedia/vlc/Makefile.inc index 7339837899c2..b9814f76e608 100644 --- a/multimedia/vlc/Makefile.inc +++ b/multimedia/vlc/Makefile.inc @@ -218,14 +218,6 @@ # Do not install Vlc's Documents # -pre-everything:: -.if exists(${LOCALBASE}/lib/libswscale.so) - @${ECHO_CMD} - @${ECHO_CMD} 'VLC cannot find ffmpeg if it has been built with the software scaler,' - @${ECHO_CMD} 'be sure to not define WITH_SWSCALER to build it.' - @${ECHO_CMD} -.endif - post-extract: # remove badly formatted pre-generated messages catalogs ${FIND} ${WRKSRC} -name "*.gmo" -delete |