diff options
author | Michael Johnson <ahze@FreeBSD.org> | 2006-01-02 20:16:06 +0000 |
---|---|---|
committer | Michael Johnson <ahze@FreeBSD.org> | 2006-01-02 20:16:06 +0000 |
commit | c5d9fdc9ca0f2011e980cfb56f165a4b28330cef (patch) | |
tree | 1b1908b1ea4fe9e143103e34ecf1a3797b4c289e /multimedia/vlc-devel/files | |
parent | [PATCH] devel/ode and devel/ode-devel: unbreak on 64bit platforms (diff) |
- Update to 0.8.5.20060102
Notes
Notes:
svn path=/head/; revision=152602
Diffstat (limited to 'multimedia/vlc-devel/files')
-rw-r--r-- | multimedia/vlc-devel/files/patch-configure | 45 | ||||
-rw-r--r-- | multimedia/vlc-devel/files/patch-include_vlc_control.h | 56 |
2 files changed, 101 insertions, 0 deletions
diff --git a/multimedia/vlc-devel/files/patch-configure b/multimedia/vlc-devel/files/patch-configure new file mode 100644 index 000000000000..d5326ad5963f --- /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 000000000000..0cd3ac2d17f9 --- /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: vlc.h 10101 2005-03-02 16:47:31Z robux4 $ ++ * ++ * 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 |