diff options
author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-10-14 18:33:48 +0800 |
---|---|---|
committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-10-14 18:33:48 +0800 |
commit | 1b3327761c8bcb98d89b529daeae9600844b4361 (patch) | |
tree | 0be1cd4eb5fec6661da4798906b0d9bd522e794f /multimedia/vlc/files | |
parent | a65aedbb59fd9dfb33a4633611777da99ec4dcd5 (diff) | |
download | marcuscom-ports-1b3327761c8bcb98d89b529daeae9600844b4361.tar marcuscom-ports-1b3327761c8bcb98d89b529daeae9600844b4361.tar.gz marcuscom-ports-1b3327761c8bcb98d89b529daeae9600844b4361.tar.bz2 marcuscom-ports-1b3327761c8bcb98d89b529daeae9600844b4361.tar.lz marcuscom-ports-1b3327761c8bcb98d89b529daeae9600844b4361.tar.xz marcuscom-ports-1b3327761c8bcb98d89b529daeae9600844b4361.tar.zst marcuscom-ports-1b3327761c8bcb98d89b529daeae9600844b4361.zip |
Clean out MarcusCom after the big import into ports.
Next stop, GNOME 2.17.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@7799 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'multimedia/vlc/files')
-rw-r--r-- | multimedia/vlc/files/patch-configure | 45 | ||||
-rw-r--r-- | multimedia/vlc/files/patch-modules_codec_ffmpeg_ffmpeg.c | 25 | ||||
-rw-r--r-- | multimedia/vlc/files/patch-modules_codec_ffmpeg_postprocess.c | 18 | ||||
-rw-r--r-- | multimedia/vlc/files/patch-modules_codec_ffmpeg_video.c | 38 | ||||
-rw-r--r-- | multimedia/vlc/files/patch-modules_codec_x264.c | 11 | ||||
-rw-r--r-- | multimedia/vlc/files/patch-modules_control_corba_corba.c | 12 | ||||
-rw-r--r-- | multimedia/vlc/files/patch-modules_stream_out_switcher.c | 11 | ||||
-rw-r--r-- | multimedia/vlc/files/patch-modules_video_filter_swscale_common.h | 21 | ||||
-rw-r--r-- | multimedia/vlc/files/patch-modules_visualization_galaktos_PCM.c | 11 | ||||
-rw-r--r-- | multimedia/vlc/files/patch-src_misc_charset.c | 12 | ||||
-rw-r--r-- | multimedia/vlc/files/svlc.desktop | 10 | ||||
-rw-r--r-- | multimedia/vlc/files/wxvlc.desktop | 10 |
12 files changed, 0 insertions, 224 deletions
diff --git a/multimedia/vlc/files/patch-configure b/multimedia/vlc/files/patch-configure deleted file mode 100644 index d5326ad59..000000000 --- a/multimedia/vlc/files/patch-configure +++ /dev/null @@ -1,45 +0,0 @@ ---- configure.orig Sun Jan 1 18:01:13 2006 -+++ configure Mon Jan 2 14:38:53 2006 -@@ -21195,11 +21195,7 @@ - done - - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -- { { echo "$as_me:$LINENO: error: cannot find ${with_dv_raw1394}/include/libraw1394/raw1394.h" >&5 --echo "$as_me: error: cannot find ${with_dv_raw1394}/include/libraw1394/raw1394.h" >&2;} -- { (exit 1); exit 1; }; } -+ echo "not found" - fi - else - -@@ -21361,8 +21357,7 @@ - if test -n "${enable_dv}" - then - { { echo "$as_me:$LINENO: error: cannot find libraw1394 headers" >&5 --echo "$as_me: error: cannot find libraw1394 headers" >&2;} -- { (exit 1); exit 1; }; } -+echo "$as_me: error: cannot find libraw1394 headers" >&2;} ;} - fi - - fi -@@ -21381,8 +21376,7 @@ - echo "$as_me:$LINENO: result: no" >&5 - echo "${ECHO_T}no" >&6 - { { echo "$as_me:$LINENO: error: cannot cd to ${real_dv_raw1394_tree}" >&5 --echo "$as_me: error: cannot cd to ${real_dv_raw1394_tree}" >&2;} -- { (exit 1); exit 1; }; } -+echo "$as_me: error: cannot cd to ${real_dv_raw1394_tree}" >&2;} ;} - fi - if test -f "${real_dv_raw1394_tree}/src/.libs/libraw1394.a" - then -@@ -21610,8 +21604,7 @@ - if test -n "${enable_dv}" - then - { { echo "$as_me:$LINENO: error: cannot find libavc1394 headers" >&5 --echo "$as_me: error: cannot find libavc1394 headers" >&2;} -- { (exit 1); exit 1; }; } -+echo "$as_me: error: cannot find libavc1394 headers" >&2;} ; } - fi - - fi diff --git a/multimedia/vlc/files/patch-modules_codec_ffmpeg_ffmpeg.c b/multimedia/vlc/files/patch-modules_codec_ffmpeg_ffmpeg.c deleted file mode 100644 index 502fe4c96..000000000 --- a/multimedia/vlc/files/patch-modules_codec_ffmpeg_ffmpeg.c +++ /dev/null @@ -1,25 +0,0 @@ ---- modules/codec/ffmpeg/ffmpeg.c.orig Fri May 13 07:48:21 2005 -+++ modules/codec/ffmpeg/ffmpeg.c Fri May 13 13:28:17 2005 -@@ -42,11 +42,9 @@ - - #include "ffmpeg.h" - --#ifdef LIBAVCODEC_PP -+#if defined(LIBAVCODEC_PP) && LIBAVCODEC_BUILD > 4750 - # ifdef HAVE_POSTPROC_POSTPROCESS_H --# include <postproc/postprocess.h> --# else --# include <libpostproc/postprocess.h> -+# include <ffmpeg/postproc/postprocess.h> - # endif - #endif - -@@ -105,7 +103,7 @@ - VLC_TRUE ); - change_integer_range( 0, 2 ); - --#ifdef LIBAVCODEC_PP -+#if defined(LIBAVCODEC_PP) && LIBAVCODEC_BUILD > 4750 - add_integer( "ffmpeg-pp-q", 0, NULL, PP_Q_TEXT, PP_Q_LONGTEXT, VLC_FALSE ); - add_string( "ffmpeg-pp-name", "default", NULL, LIBAVCODEC_PP_TEXT, - LIBAVCODEC_PP_LONGTEXT, VLC_TRUE ); diff --git a/multimedia/vlc/files/patch-modules_codec_ffmpeg_postprocess.c b/multimedia/vlc/files/patch-modules_codec_ffmpeg_postprocess.c deleted file mode 100644 index 29b5eb319..000000000 --- a/multimedia/vlc/files/patch-modules_codec_ffmpeg_postprocess.c +++ /dev/null @@ -1,18 +0,0 @@ ---- modules/codec/ffmpeg/postprocess.c.orig Fri May 13 07:48:21 2005 -+++ modules/codec/ffmpeg/postprocess.c Sat May 14 00:11:53 2005 -@@ -35,13 +35,9 @@ - - #include "ffmpeg.h" - --#ifdef LIBAVCODEC_PP -+#if defined(LIBAVCODEC_PP) && LIBAVCODEC_BUILD > 4750 - --#ifdef HAVE_POSTPROC_POSTPROCESS_H --# include <postproc/postprocess.h> --#else --# include <libpostproc/postprocess.h> --#endif -+#include <ffmpeg/postproc/postprocess.h> - - #ifndef PP_CPU_CAPS_ALTIVEC - # define PP_CPU_CAPS_ALTIVEC 0 diff --git a/multimedia/vlc/files/patch-modules_codec_ffmpeg_video.c b/multimedia/vlc/files/patch-modules_codec_ffmpeg_video.c deleted file mode 100644 index 1ed5bda68..000000000 --- a/multimedia/vlc/files/patch-modules_codec_ffmpeg_video.c +++ /dev/null @@ -1,38 +0,0 @@ ---- modules/codec/ffmpeg/video.c.orig Fri May 13 13:30:36 2005 -+++ modules/codec/ffmpeg/video.c Fri May 13 13:32:42 2005 -@@ -202,7 +202,7 @@ - - p_pic = p_dec->pf_vout_buffer_new( p_dec ); - --#ifdef LIBAVCODEC_PP -+#if defined(LIBAVCODEC_PP) && LIBAVCODEC_BUILD > 4750 - if( p_sys->p_pp && p_sys->b_pp && !p_sys->b_pp_init ) - { - E_(InitPostproc)( p_dec, p_sys->p_pp, p_context->width, -@@ -301,7 +301,7 @@ - p_sys->b_direct_rendering = 1; - } - --#ifdef LIBAVCODEC_PP -+#if defined(LIBAVCODEC_PP) && LIBAVCODE_BUILD > 4750 - p_sys->p_pp = NULL; - p_sys->b_pp = p_sys->b_pp_async = p_sys->b_pp_init = VLC_FALSE; - p_sys->p_pp = E_(OpenPostproc)( p_dec, &p_sys->b_pp_async ); -@@ -719,7 +719,7 @@ - - if( p_sys->p_ff_pic ) av_free( p_sys->p_ff_pic ); - --#ifdef LIBAVCODEC_PP -+#if defined(LIBAVCODEC_PP) && LIBAVCODEC_BUILD > 4750 - E_(ClosePostproc)( p_dec, p_sys->p_pp ); - #endif - -@@ -741,7 +741,7 @@ - uint8_t *p_dst, *p_src; - int i_src_stride, i_dst_stride; - --#ifdef LIBAVCODEC_PP -+#if defined(LIBAVCODEC_PP) && LIBAVCODEC_BUILD > 4750 - if( p_sys->p_pp && p_sys->b_pp ) - E_(PostprocPict)( p_dec, p_sys->p_pp, p_pic, p_ff_pic ); - else diff --git a/multimedia/vlc/files/patch-modules_codec_x264.c b/multimedia/vlc/files/patch-modules_codec_x264.c deleted file mode 100644 index 2ff0294a2..000000000 --- a/multimedia/vlc/files/patch-modules_codec_x264.c +++ /dev/null @@ -1,11 +0,0 @@ ---- modules/codec/x264.c.orig Wed Aug 9 21:24:08 2006 -+++ modules/codec/x264.c Wed Aug 9 21:24:27 2006 -@@ -588,7 +588,7 @@ - - /* cbr = 1 overrides qp or crf and sets an average bitrate - but maxrate = average bitrate is needed for "real" CBR */ -- if( p_sys->param.rc.i_bitrate > 0 ) p_sys->param.rc.b_cbr = 1; -+ if( p_sys->param.rc.i_bitrate > 0 ) p_sys->param.rc.i_rc_method = 1; - - var_Get( p_enc, SOUT_CFG_PREFIX "qpstep", &val ); - if( val.i_int >= 0 && val.i_int <= 51 ) p_sys->param.rc.i_qp_step = val.i_int; diff --git a/multimedia/vlc/files/patch-modules_control_corba_corba.c b/multimedia/vlc/files/patch-modules_control_corba_corba.c deleted file mode 100644 index 040a156ca..000000000 --- a/multimedia/vlc/files/patch-modules_control_corba_corba.c +++ /dev/null @@ -1,12 +0,0 @@ ---- modules/control/corba/corba.c.orig Sun Aug 20 00:16:21 2006 -+++ modules/control/corba/corba.c Sun Aug 20 00:17:24 2006 -@@ -28,8 +28,8 @@ - #include "MediaControl.h" - #include "orbit/poa/portableserver-poa-type.h" - --#include <vlc/control.h> - #include <vlc/vlc.h> -+#include <vlc/mediacontrol.h> - #include <vlc/intf.h> - #include <vlc/vout.h> - #include <vlc/aout.h> diff --git a/multimedia/vlc/files/patch-modules_stream_out_switcher.c b/multimedia/vlc/files/patch-modules_stream_out_switcher.c deleted file mode 100644 index 3952ddff1..000000000 --- a/multimedia/vlc/files/patch-modules_stream_out_switcher.c +++ /dev/null @@ -1,11 +0,0 @@ ---- modules/stream_out/switcher.c.orig Wed Mar 23 03:57:15 2005 -+++ modules/stream_out/switcher.c Wed Mar 23 03:57:50 2005 -@@ -44,7 +44,7 @@ - #ifdef HAVE_POSTPROC_POSTPROCESS_H - # include <postproc/postprocess.h> - #else --# include <libpostproc/postprocess.h> -+# include <ffmpeg/postproc/postprocess.h> - #endif - - #define SOUT_CFG_PREFIX "sout-switcher-" diff --git a/multimedia/vlc/files/patch-modules_video_filter_swscale_common.h b/multimedia/vlc/files/patch-modules_video_filter_swscale_common.h deleted file mode 100644 index 4219d8b53..000000000 --- a/multimedia/vlc/files/patch-modules_video_filter_swscale_common.h +++ /dev/null @@ -1,21 +0,0 @@ ---- modules/video_filter/swscale/common.h.orig Fri May 13 03:23:24 2005 -+++ modules/video_filter/swscale/common.h Fri May 13 03:37:24 2005 -@@ -36,7 +36,17 @@ - #define MANGLE(a) #a - #endif - --#ifdef ARCH_X86 -+#if (defined(__unix__) || defined(unix)) && !defined(USG) -+#include <sys/param.h> -+#endif -+ -+#if (defined(__FreeBSD__) && __FreeBSD_version >= 500000) -+#include <sys/endian.h> -+#define bswap_16(x) bswap16(x) -+#elif (defined(__FreeBSD__) && __FreeBSD_version <= 500000) -+#include <sys/endian.h> -+#define bswap_16(x) be16toh(x) -+#elif ARCH_X86 - static inline unsigned short ByteSwap16(unsigned short x) - { - __asm("xchgb %b0,%h0" : diff --git a/multimedia/vlc/files/patch-modules_visualization_galaktos_PCM.c b/multimedia/vlc/files/patch-modules_visualization_galaktos_PCM.c deleted file mode 100644 index 78799ac46..000000000 --- a/multimedia/vlc/files/patch-modules_visualization_galaktos_PCM.c +++ /dev/null @@ -1,11 +0,0 @@ ---- modules/visualization/galaktos/PCM.c.orig Fri Nov 26 08:21:47 2004 -+++ modules/visualization/galaktos/PCM.c Fri Nov 26 08:22:06 2004 -@@ -79,7 +79,7 @@ - //Takes in a 2x512 array of PCM samples - //and stores them - --void addPCM(int16_t PCMdata[2][512]) -+void addPCM(short PCMdata[2][512]) - { - int i,j; - int samples=512; diff --git a/multimedia/vlc/files/patch-src_misc_charset.c b/multimedia/vlc/files/patch-src_misc_charset.c deleted file mode 100644 index 2fe21e7c4..000000000 --- a/multimedia/vlc/files/patch-src_misc_charset.c +++ /dev/null @@ -1,12 +0,0 @@ ---- src/misc/charset.c.orig Mon May 29 15:08:35 2006 -+++ src/misc/charset.c Mon May 29 15:09:00 2006 -@@ -570,7 +570,9 @@ - /* Some systems (like Darwin, SunOS 4 or DJGPP) have only the C locale. - * Therefore we don't use setlocale here; it would return "C". */ - # if HAVE_SETLOCALE && !__APPLE__ -+# if defined LC_ALL - psz_lang = setlocale( LC_ALL, NULL ); -+# endif - # endif - if( psz_lang == NULL || psz_lang[0] == '\0' ) - { diff --git a/multimedia/vlc/files/svlc.desktop b/multimedia/vlc/files/svlc.desktop deleted file mode 100644 index e7ed9a3ee..000000000 --- a/multimedia/vlc/files/svlc.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=VideoLAN (skins) Media Player -Comment=Video and Audio player and server -Icon=gvlc.png -Exec=vlc --intf skins2 -TryExec=svlc -Terminal=false -Type=Application -Categories=Application;AudioVideo; diff --git a/multimedia/vlc/files/wxvlc.desktop b/multimedia/vlc/files/wxvlc.desktop deleted file mode 100644 index c95dd3f62..000000000 --- a/multimedia/vlc/files/wxvlc.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=VideoLAN (wxgtk) Media Player -Comment=Video and Audio player and server -Icon=vlc.png -Exec=vlc -TryExec=wxvlc -Terminal=false -Type=Application -Categories=Application;AudioVideo; |