- Add vlc-devel with hal enabled by default (per configure script) with

  a WITHOUT_HAL knob


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@6212 df743ca5-7f9a-e211-a948-0013205c9059

10 files changed, 245 insertions, 0 deletions

diff --git a/multimedia/vlc-devel/files/patch-configure b/multimedia/vlc-devel/files/patch-configure
new file mode 100644
index 000000000..d5326ad59
--- /dev/null
+++ b/multimedia/vlc-devel/files/patch-configure
@@ -0,0 +1,45 @@
+--- 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-devel/files/patch-include_vlc_control.h b/multimedia/vlc-devel/files/patch-include_vlc_control.h
new file mode 100644
index 000000000..d3e8d64c7
--- /dev/null
+++ b/multimedia/vlc-devel/files/patch-include_vlc_control.h
@@ -0,0 +1,56 @@
+--- /dev/null	Mon Jan  2 14:48:08 2006
++++ include/vlc_control.h	Mon Jan  2 14:46:25 2006
+@@ -0,0 +1,53 @@
++/*****************************************************************************
++ * control.h: private header for mediacontrol
++ *****************************************************************************
++ * Copyright (C) 2005 the VideoLAN team
++ * $Id: patch-include_vlc_control.h,v 1.1 2006-05-04 15:12:39 ahze Exp $
++ *
++ * Authors: Olivier Aubert <olivier.aubert@liris.univ-lyon1.fr>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
++ *****************************************************************************/
++
++#ifndef _VLC_PRIVATE_CONTROL_H
++#define _VLC_PRIVATE_CONTROL_H 1
++
++# ifdef __cplusplus
++extern "C" {
++# endif
++
++#include <vlc/vlc.h>
++#include "vlc/control_structures.h"
++
++typedef struct {
++    vlc_object_t  *p_vlc;
++    playlist_t    *p_playlist;
++    intf_thread_t *p_intf;
++    int           vlc_object_id;
++} mediacontrol_Instance;
++
++vlc_int64_t mediacontrol_unit_convert( input_thread_t *p_input,
++                                       mediacontrol_PositionKey from,
++                                       mediacontrol_PositionKey to,
++                                       vlc_int64_t value );
++vlc_int64_t mediacontrol_position2microsecond(
++    input_thread_t *p_input,
++    const mediacontrol_Position *pos );
++
++# ifdef __cplusplus
++}
++# endif
++
++#endif
diff --git a/multimedia/vlc-devel/files/patch-modules_codec_ffmpeg_ffmpeg.c b/multimedia/vlc-devel/files/patch-modules_codec_ffmpeg_ffmpeg.c
new file mode 100644
index 000000000..502fe4c96
--- /dev/null
+++ b/multimedia/vlc-devel/files/patch-modules_codec_ffmpeg_ffmpeg.c
@@ -0,0 +1,25 @@
+--- 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-devel/files/patch-modules_codec_ffmpeg_postprocess.c b/multimedia/vlc-devel/files/patch-modules_codec_ffmpeg_postprocess.c
new file mode 100644
index 000000000..29b5eb319
--- /dev/null
+++ b/multimedia/vlc-devel/files/patch-modules_codec_ffmpeg_postprocess.c
@@ -0,0 +1,18 @@
+--- 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-devel/files/patch-modules_codec_ffmpeg_video.c b/multimedia/vlc-devel/files/patch-modules_codec_ffmpeg_video.c
new file mode 100644
index 000000000..1ed5bda68
--- /dev/null
+++ b/multimedia/vlc-devel/files/patch-modules_codec_ffmpeg_video.c
@@ -0,0 +1,38 @@
+--- 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-devel/files/patch-modules_stream_out_switcher.c b/multimedia/vlc-devel/files/patch-modules_stream_out_switcher.c
new file mode 100644
index 000000000..3952ddff1
--- /dev/null
+++ b/multimedia/vlc-devel/files/patch-modules_stream_out_switcher.c
@@ -0,0 +1,11 @@
+--- 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-devel/files/patch-modules_video_filter_swscale_common.h b/multimedia/vlc-devel/files/patch-modules_video_filter_swscale_common.h
new file mode 100644
index 000000000..4219d8b53
--- /dev/null
+++ b/multimedia/vlc-devel/files/patch-modules_video_filter_swscale_common.h
@@ -0,0 +1,21 @@
+--- 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-devel/files/patch-modules_visualization_galaktos_PCM.c b/multimedia/vlc-devel/files/patch-modules_visualization_galaktos_PCM.c
new file mode 100644
index 000000000..78799ac46
--- /dev/null
+++ b/multimedia/vlc-devel/files/patch-modules_visualization_galaktos_PCM.c
@@ -0,0 +1,11 @@
+--- 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-devel/files/svlc.desktop b/multimedia/vlc-devel/files/svlc.desktop
new file mode 100644
index 000000000..e7ed9a3ee
--- /dev/null
+++ b/multimedia/vlc-devel/files/svlc.desktop
@@ -0,0 +1,10 @@
+[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-devel/files/wxvlc.desktop b/multimedia/vlc-devel/files/wxvlc.desktop
new file mode 100644
index 000000000..c95dd3f62
--- /dev/null
+++ b/multimedia/vlc-devel/files/wxvlc.desktop
@@ -0,0 +1,10 @@
+[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;