diff --git a/media-video/ffmpeg/ffmpeg-23081.recipe b/media-video/ffmpeg/ffmpeg-23081.recipe deleted file mode 100644 index f423a2a47..000000000 --- a/media-video/ffmpeg/ffmpeg-23081.recipe +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION="FFmpeg is a complete, cross-platform solution to record, convert and stream audio and video. It includes libavcodec - the leading audio/video codec library." -HOMEPAGE="http://www.ffmpeg.org" -SRC_URI="svn://svn.ffmpeg.org/ffmpeg/trunk#23081" -#CHECKSUM_MD5="" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd ffmpeg-23081 - chmod 777 configure - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-debug --disable-mmx --enable-shared --enable-gpl - make -} - -INSTALL() -{ - cd ffmpeg-23081 - make install -} diff --git a/media-video/ffmpeg/ffmpeg-7407.recipe b/media-video/ffmpeg/ffmpeg-7407.recipe deleted file mode 100644 index 832de1171..000000000 --- a/media-video/ffmpeg/ffmpeg-7407.recipe +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION="FFmpeg is a complete, cross-platform solution to record, convert and stream audio and video. It includes libavcodec - the leading audio/video codec library." -HOMEPAGE="http://www.ffmpeg.org" -SRC_URI="svn://svn.ffmpeg.org/ffmpeg/trunk#7407" -#CHECKSUM_MD5="" -REVISION="1" -STATUS_HAIKU="broken" -DEPEND="" -BUILD() -{ - cd ffmpeg-7407 - chmod 777 configure - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-debug --disable-mmx --enable-shared --enable-gpl --enable-pp - make -} - -INSTALL() -{ - cd ffmpeg-7407 - make install -} diff --git a/media-video/ffmpeg/patches/ffmpeg-23081.patch b/media-video/ffmpeg/patches/ffmpeg-23081.patch deleted file mode 100644 index 28a7947fc..000000000 --- a/media-video/ffmpeg/patches/ffmpeg-23081.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -urN ffmpeg-23081/configure ffmpeg-23081-haiku/configure ---- ffmpeg-23081/configure 2010-05-10 22:20:12.867958784 +0000 -+++ ffmpeg-23081-haiku/configure 2010-05-10 22:26:05.354680832 +0000 -@@ -2121,7 +2121,7 @@ - - # OS specific - case $target_os in -- beos|haiku|zeta) -+ beos|zeta) - prefix_default="$HOME/config" - # 3 gcc releases known for BeOS, each with ugly bugs - gcc_version="$($cc -v 2>&1 | grep version | cut -d ' ' -f3-)" -@@ -2145,6 +2145,16 @@ - enable beos_netserver - network_extralibs="-lnet" - fi ;; -+ haiku) -+ prefix_default="/boot/common" -+ add_cflags "-DPIC -fomit-frame-pointer" -+ beosthreads="yes" -+ extralibs="" -+ audio_oss="no" -+ video4linux="no" -+ video4linux2="no" -+ network_extralibs="-lnetwork" -+ ;; - sunos) - FFSERVERLDFLAGS="" - SHFLAGS='-shared -Wl,-h,$$(@F)' diff --git a/media-video/ffmpeg/patches/ffmpeg-7407.patch b/media-video/ffmpeg/patches/ffmpeg-7407.patch deleted file mode 100644 index 2925d992a..000000000 --- a/media-video/ffmpeg/patches/ffmpeg-7407.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff -ur ffmpeg-r7407/Makefile ffmpeg-r7407-haiku/Makefile ---- ffmpeg-r7407/Makefile 2009-11-16 21:38:53.000000000 +0000 -+++ ffmpeg-r7407-haiku/Makefile 2009-11-16 21:55:57.000000000 +0000 -@@ -159,7 +159,9 @@ - ifeq ($(CONFIG_PP),yes) - $(MAKE) -C libpostproc install-headers - endif -+ifeq ($(CONFIG_SWSCALER),yes) - $(MAKE) -C libswscale install-headers -+endif - - uninstall: uninstall-progs uninstall-libs uninstall-headers uninstall-man uninstall-vhook - -diff -ur ffmpeg-r7407/configure ffmpeg-r7407-haiku/configure ---- ffmpeg-r7407/configure 2009-11-16 21:38:53.000000000 +0000 -+++ ffmpeg-r7407-haiku/configure 2009-11-16 21:55:54.000000000 +0000 -@@ -690,6 +690,14 @@ - beos_netserver="yes" - extralibs="-lnet" - fi ;; -+Haiku) -+add_cflags "-DPIC -fomit-frame-pointer" -+beosthreads="yes" -+extralibs="" -+audio_oss="no" -+video4linux="no" -+video4linux2="no" -+;; - SunOS) - video4linux="no" - video4linux2="no" -diff -ur ffmpeg-r7407/libswscale/swscale.h ffmpeg-r7407-haiku/libswscale/swscale.h ---- ffmpeg-r7407/libswscale/swscale.h 2009-11-16 21:40:14.000000000 +0000 -+++ ffmpeg-r7407-haiku/libswscale/swscale.h 2009-11-16 21:56:10.000000000 +0000 -@@ -131,10 +131,10 @@ - * @param flags specify which algorithm and options to use for rescaling - * @return a pointer to an allocated context, or NULL in case of error - */ --struct SwsContext *sws_getContext(int srcW, int srcH, enum PixelFormat srcFormat, -- int dstW, int dstH, enum PixelFormat dstFormat, -+struct SwsContext *sws_getContext(int srcW, int srcH, int srcFormat, -+ int dstW, int dstH, int dstFormat, - int flags, SwsFilter *srcFilter, -- SwsFilter *dstFilter, const double *param); -+ SwsFilter *dstFilter, double *param); - - /** - * Scales the image slice in srcSlice and puts the resulting scaled -@@ -267,9 +267,9 @@ - * are assumed to remain the same. - */ - struct SwsContext *sws_getCachedContext(struct SwsContext *context, -- int srcW, int srcH, enum PixelFormat srcFormat, -- int dstW, int dstH, enum PixelFormat dstFormat, -+ int srcW, int srcH, int srcFormat, -+ int dstW, int dstH, int dstFormat, - int flags, SwsFilter *srcFilter, -- SwsFilter *dstFilter, const double *param); -+ SwsFilter *dstFilter, double *param); - - #endif /* SWSCALE_SWSCALE_H */