cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 0.8.6

Browse Source
This commit is contained in:
jolan 2006-12-23 13:31:30 +00:00
parent e1e5a48bd0
commit 06e809edbe
14 changed files with 178 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
x11/vlc/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.40 2006/12/16 12:22:36 espie Exp $
# $OpenBSD: Makefile,v 1.41 2006/12/23 13:31:30 jolan Exp $
SHARED_ONLY= Yes
COMMENT= "videolan client; multimedia player"
V= 0.8.5
V= 0.8.6
DISTNAME= vlc-${V}
CATEGORIES= x11
MASTER_SITES= http://download.videolan.org/pub/videolan/vlc/${V}/
@ -191,7 +191,7 @@ CFLAGS+=-mhard-quad-float
# win32 codecs support uses i386_set_ldt
post-configure:
.if ${MACHINE_ARCH} == "i386"
@perl -pi -e s,'VLC_ENTRY = vlc_entry__0_8_5','VLC_ENTRY = vlc_entry__0_8_5 -li386',g \
@perl -pi -e s,'VLC_ENTRY = vlc_entry__0_8_6','VLC_ENTRY = vlc_entry__0_8_6 -li386',g \
${WRKSRC}/modules/codec/Makefile ${WRKSRC}/modules/codec/dmo/Makefile
.endif

8
x11/vlc/distinfo
View File

@ -1,4 +1,4 @@
MD5 (vlc-0.8.5.tar.gz) = 90d19a5ba2ef2e03e6062fadc2e810d2
RMD160 (vlc-0.8.5.tar.gz) = 1ec6c84eac6ec11a961179f30e8d9701c0a6ff56
SHA1 (vlc-0.8.5.tar.gz) = 6c349e2a2d60576833c567dd984e2a5d4bc42975
SIZE (vlc-0.8.5.tar.gz) = 12461262
MD5 (vlc-0.8.6.tar.gz) = d5277e1b1d9853d2e7e84e0500807218
RMD160 (vlc-0.8.6.tar.gz) = a2c5cb60ba0215516250baea4fd4937b1b8545fe
SHA1 (vlc-0.8.6.tar.gz) = 14b514b2f59b25de8e347364a30ea8fe88d37aaf
SIZE (vlc-0.8.6.tar.gz) = 15427589

45
x11/vlc/patches/patch-aclocal_m4 Normal file
View File

@ -0,0 +1,45 @@
$OpenBSD: patch-aclocal_m4,v 1.5 2006/12/23 13:31:31 jolan Exp $
--- aclocal.m4.orig Fri Dec 8 19:33:37 2006
+++ aclocal.m4 Sat Dec 23 06:31:31 2006
@@ -1041,7 +1041,7 @@ AC_DEFUN([VLC_LIBRARY_SUFFIX], [
darwin*)
LIBEXT=".dylib"
;;
- *mingw32* | *cygwin* | *wince* | *mingwce* | *pe*)
+ *mingw32* | *cygwin* | *wince* | *mingwce*)
LIBEXT=".dll"
;;
hpux*)
@@ -1059,7 +1059,7 @@ AC_DEFUN([VLC_SYMBOL_PREFIX], [
AC_MSG_CHECKING(for prefix to exported symbols)
SYMPREF=""
case "${target_os}" in
- darwin* | *mingw32* | *cygwin* | *wince* | *mingwce* | *pe*)
+ darwin* | *mingw32* | *cygwin* | *wince* | *mingwce*)
SYMPREF="_"
;;
esac
@@ -8754,9 +8754,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
found_so=
found_a=
if test $use_additional = yes; then
- if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
+ if test -n "$shlibext" && test "`echo $additional_libdir/lib$name.$shlibext*`" != "$additional_libdir/lib$name.$shlibext*"; then
found_dir="$additional_libdir"
- found_so="$additional_libdir/lib$name.$shlibext"
+ found_so="-l$name"
if test -f "$additional_libdir/lib$name.la"; then
found_la="$additional_libdir/lib$name.la"
fi
@@ -8776,9 +8776,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
case "$x" in
-L*)
dir=`echo "X$x" | sed -e 's/^X-L//'`
- if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
+ if test -n "$shlibext" && test "`echo $dir/lib$name.$shlibext*`" != "$dir/lib$name.$shlibext*"; then
found_dir="$dir"
- found_so="$dir/lib$name.$shlibext"
+ found_so="-l$name"
if test -f "$dir/lib$name.la"; then
found_la="$dir/lib$name.la"
fi

32
x11/vlc/patches/patch-configure_ac
View File

@ -1,7 +1,25 @@
$OpenBSD: patch-configure_ac,v 1.5 2006/11/03 15:15:07 jolan Exp $
--- configure.ac.orig Sat May 6 10:52:25 2006
+++ configure.ac Fri Oct 20 14:32:54 2006
@@ -648,6 +648,9 @@ if test "${SYS}" != "mingw32" -a "${SYS}
$OpenBSD: patch-configure_ac,v 1.6 2006/12/23 13:31:31 jolan Exp $
--- configure.ac.orig Fri Dec 8 19:32:53 2006
+++ configure.ac Sat Dec 23 05:28:10 2006
@@ -210,7 +210,7 @@ case "${target_os}" in
VLC_ADD_CFLAGS([libvlc],[-x objective-c])
VLC_ADD_CFLAGS([vlc],[-x objective-c])
;;
- *mingw32* | *cygwin* | *wince* | *mingwce* | *pe*)
+ *mingw32* | *cygwin* | *wince* | *mingwce*)
AC_CHECK_TOOL(WINDRES, windres, :)
case "${target_os}" in
@@ -226,7 +226,7 @@ case "${target_os}" in
#endif],
SYS=mingw32, SYS=cygwin)
;;
- *wince* | *mingwce* | *pe*)
+ *wince* | *mingwce*)
SYS=mingwce
;;
esac
@@ -664,6 +664,9 @@ if test "${SYS}" != "mingw32" -a "${SYS}
dnl Check for pthreads - borrowed from XMMS
THREAD_LIB=error
if test "${THREAD_LIB}" = "error"; then
@ -11,16 +29,16 @@ $OpenBSD: patch-configure_ac,v 1.5 2006/11/03 15:15:07 jolan Exp $
AC_CHECK_LIB(pthread,main,THREAD_LIB="-lpthread")
fi
if test "${THREAD_LIB}" = "error"; then
@@ -2589,7 +2592,7 @@ dnl Look for a ffmpeg-config (we are on
@@ -2675,7 +2678,7 @@ dnl Look for a ffmpeg-config (we are on
else
dnl Trying with pkg-config
- PKG_CHECK_MODULES(FFMPEG,[libavcodec, libavformat],
+ PKG_CHECK_MODULES(FFMPEG,[libavcodec, libavformat, libpostproc],
[
AC_CHECK_HEADERS(ffmpeg/avcodec.h)
AC_CHECK_HEADERS(ffmpeg/avcodec.h, [], [AC_MSG_ERROR([Missing header file ffmpeg/avcodec.h.])] )
AC_CHECK_HEADERS(ffmpeg/avformat.h)
@@ -3236,13 +3239,13 @@ AC_ARG_ENABLE(png,
@@ -3332,13 +3335,13 @@ AC_ARG_ENABLE(png,
[ --enable-png PNG support (default enabled)])
if test "${enable_png}" != "no"; then
AC_CHECK_HEADERS(png.h, [

8
x11/vlc/patches/patch-loader_pe_image_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-loader_pe_image_c,v 1.1 2005/12/24 09:01:17 jolan Exp $
--- loader/pe_image.c.orig Sun Dec 11 15:36:29 2005
+++ loader/pe_image.c Sat Dec 24 02:11:48 2005
@@ -905,7 +905,7 @@ void PE_UnloadLibrary(WINE_MODREF *wm)
$OpenBSD: patch-loader_pe_image_c,v 1.2 2006/12/23 13:31:31 jolan Exp $
--- loader/pe_image.c.orig Fri Dec 8 19:12:27 2006
+++ loader/pe_image.c Sat Dec 23 03:45:09 2006
@@ -921,7 +921,7 @@ void PE_UnloadLibrary(WINE_MODREF *wm)
*/
static void __attribute__((noinline)) extend_stack_for_dll_alloca(void)
{

8
x11/vlc/patches/patch-loader_win32_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-loader_win32_c,v 1.1 2005/12/24 09:01:17 jolan Exp $
--- loader/win32.c.orig Sun Dec 11 15:36:29 2005
+++ loader/win32.c Sat Dec 24 02:21:10 2005
@@ -993,7 +993,7 @@ static void WINAPI expGetSystemInfo(SYST
$OpenBSD: patch-loader_win32_c,v 1.2 2006/12/23 13:31:31 jolan Exp $
--- loader/win32.c.orig Fri Dec 8 19:12:27 2006
+++ loader/win32.c Sat Dec 23 03:45:09 2006
@@ -1012,7 +1012,7 @@ static void WINAPI expGetSystemInfo(SYST
/* disable cpuid based detection (mplayer's cpudetect.c does this - see above) */
#ifndef MPLAYER

8
x11/vlc/patches/patch-modules_access_ftp_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-modules_access_ftp_c,v 1.2 2006/11/03 15:15:07 jolan Exp $
--- modules/access/ftp.c.orig Sat May 6 10:52:18 2006
+++ modules/access/ftp.c Fri Oct 20 14:32:38 2006
@@ -534,7 +534,7 @@ static int ftp_ReadCommand( access_t *p_
$OpenBSD: patch-modules_access_ftp_c,v 1.3 2006/12/23 13:31:31 jolan Exp $
--- modules/access/ftp.c.orig Fri Dec 8 19:12:17 2006
+++ modules/access/ftp.c Sat Dec 23 03:45:09 2006
@@ -542,7 +542,7 @@ static int ftp_ReadCommand( access_t *p_
return( i_answer / 100 );
}

21
x11/vlc/patches/patch-modules_codec_faad_c Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-modules_codec_faad_c,v 1.1 2006/12/23 13:31:31 jolan Exp $
--- modules/codec/faad.c.orig Fri Dec 8 19:12:20 2006
+++ modules/codec/faad.c Sat Dec 23 03:55:01 2006
@@ -315,6 +315,9 @@ static aout_buffer_t *DecodeBlock( decod
p_dec->fmt_out.audio.i_rate = frame.samplerate;
p_dec->fmt_out.audio.i_channels = frame.channels;
+#if 0
+XXX: faad needs to be updated to 2.5?
+
/* Adjust stream info when dealing with SBR/PS */
if( (p_sys->b_sbr != frame.sbr || p_sys->b_ps != frame.ps) &&
p_dec->p_parent->i_object_type == VLC_OBJECT_INPUT )
@@ -336,6 +339,7 @@ static aout_buffer_t *DecodeBlock( decod
free( psz_cat );
p_sys->b_sbr = frame.sbr; p_sys->b_ps = frame.ps;
}
+#endif
/* Convert frame.channel_position to our own channel values */
for( i = 0; i < frame.channels; i++ )

12
x11/vlc/patches/patch-modules_demux_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-modules_demux_Makefile_in,v 1.1 2006/12/23 13:31:31 jolan Exp $
--- modules/demux/Makefile.in.orig Fri Dec 8 19:34:22 2006
+++ modules/demux/Makefile.in Sat Dec 23 07:17:18 2006
@@ -1769,7 +1769,7 @@ LTCXXCOMPILE = $(LIBTOOL) --mode=compile
$(AM_CXXFLAGS) $(CXXFLAGS)
CXXLD = $(CXX)
CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ $(AM_LDFLAGS) $(LDFLAGS) -lstdc++ -o $@
DIST_SOURCES = $(liba52sys_a_SOURCES) $(liba52sys_plugin_a_SOURCES) \
$(libaiff_a_SOURCES) $(libaiff_plugin_a_SOURCES) \
$(libau_a_SOURCES) $(libau_plugin_a_SOURCES) \

12
x11/vlc/patches/patch-modules_gui_wxwidgets_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-modules_gui_wxwidgets_Makefile_in,v 1.1 2006/12/23 13:31:31 jolan Exp $
--- modules/gui/wxwidgets/Makefile.in.orig Fri Dec 8 19:34:35 2006
+++ modules/gui/wxwidgets/Makefile.in Sat Dec 23 07:16:44 2006
@@ -710,7 +710,7 @@ LTCXXCOMPILE = $(LIBTOOL) --mode=compile
$(AM_CXXFLAGS) $(CXXFLAGS)
CXXLD = $(CXX)
CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ $(AM_LDFLAGS) $(LDFLAGS) -lstdc++ -o $@
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \

11
x11/vlc/patches/patch-share_Makefile_in Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-share_Makefile_in,v 1.1 2006/12/23 13:31:31 jolan Exp $
--- share/Makefile.in.orig Sat Dec 23 04:09:53 2006
+++ share/Makefile.in Sat Dec 23 04:40:35 2006
@@ -805,7 +805,6 @@ skins2/default.vlt: $(skins2_default_vlt
skins2/default.vlt:
mkdir -p skins2
- tar cvvzf skins2/default.vlt --exclude .svn -C $(srcdir)/skins2 default/
.PHONY: $(nobase_pkgdata_DATA)
# Tell versions [3.59,3.63) of GNU make to not export all variables.

8
x11/vlc/patches/patch-src_misc_modules_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_misc_modules_c,v 1.4 2006/11/03 15:15:07 jolan Exp $
--- src/misc/modules.c.orig Sat May 6 10:52:13 2006
+++ src/misc/modules.c Fri Oct 20 14:32:39 2006
$OpenBSD: patch-src_misc_modules_c,v 1.5 2006/12/23 13:31:31 jolan Exp $
--- src/misc/modules.c.orig Fri Dec 8 19:12:08 2006
+++ src/misc/modules.c Sat Dec 23 03:45:09 2006
@@ -1589,6 +1589,7 @@ static char * GetWindowsError( void )
*****************************************************************************/
static void CacheLoad( vlc_object_t *p_this )
@ -25,7 +25,7 @@ $OpenBSD: patch-src_misc_modules_c,v 1.4 2006/11/03 15:15:07 jolan Exp $
+#if 0
for( i = 0; i < i_cache; i++ )
{
int16_t i_size;
uint16_t i_size;
@@ -1799,6 +1801,7 @@ static void CacheLoad( vlc_object_t *p_t
p_this->p_libvlc->p_module_bank->i_loaded_cache = 0;

4
x11/vlc/pkg/DESCR
View File

@ -15,7 +15,3 @@ e.g. by running:
This value can be made permanent by editing /etc/sysctl.conf, see
sysctl.conf(5) for more details.
FLAVORs:
no_dvd - disable dvd playing code

35
x11/vlc/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.21 2006/11/03 15:15:07 jolan Exp $
@comment $OpenBSD: PLIST,v 1.22 2006/12/23 13:31:31 jolan Exp $
%%altivec%%
%%win32%%
%%x86opt%%
@ -17,8 +17,6 @@ include/vlc/sout.h
include/vlc/vlc.h
include/vlc/vout.h
lib/libvlc.a
lib/mozilla/
lib/mozilla/components/
lib/vlc/
lib/vlc/access/
lib/vlc/access/libaccess_directory_plugin.so
@ -33,6 +31,7 @@ lib/vlc/access/libdvdnav_plugin.so
lib/vlc/access/libdvdread_plugin.so
lib/vlc/access/libscreen_plugin.so
lib/vlc/access_filter/
lib/vlc/access_filter/libaccess_filter_dump_plugin.so
lib/vlc/access_filter/libaccess_filter_record_plugin.so
lib/vlc/access_filter/libaccess_filter_timeshift_plugin.so
lib/vlc/access_output/
@ -86,6 +85,7 @@ lib/vlc/codec/libdts_plugin.so
lib/vlc/codec/libdvbsub_plugin.so
lib/vlc/codec/libfaad_plugin.so
lib/vlc/codec/libfake_plugin.so
lib/vlc/codec/libffmpeg_plugin.so
lib/vlc/codec/libflacdec_plugin.so
lib/vlc/codec/liblibmpeg2_plugin.so
lib/vlc/codec/liblpcm_plugin.so
@ -120,6 +120,7 @@ lib/vlc/demux/libm3u_plugin.so
lib/vlc/demux/libm4a_plugin.so
lib/vlc/demux/libm4v_plugin.so
lib/vlc/demux/libmjpeg_plugin.so
lib/vlc/demux/libmkv_plugin.so
lib/vlc/demux/libmp4_plugin.so
lib/vlc/demux/libmpc_plugin.so
lib/vlc/demux/libmpga_plugin.so
@ -135,6 +136,7 @@ lib/vlc/demux/librawdv_plugin.so
lib/vlc/demux/libreal_plugin.so
lib/vlc/demux/libsgimb_plugin.so
lib/vlc/demux/libsubtitle_plugin.so
lib/vlc/demux/libtta_plugin.so
lib/vlc/demux/libty_plugin.so
lib/vlc/demux/libvobsub_plugin.so
lib/vlc/demux/libvoc_plugin.so
@ -143,9 +145,6 @@ lib/vlc/demux/libxa_plugin.so
lib/vlc/gui/
lib/vlc/gui/libncurses_plugin.so
lib/vlc/gui/libwxwidgets_plugin.so
lib/vlc/libffmpeg.a
lib/vlc/libmkv.a
lib/vlc/libstream_out_switcher.a
lib/vlc/libtheora.a
lib/vlc/libxvideo.a
lib/vlc/misc/
@ -191,6 +190,7 @@ lib/vlc/stream_out/libstream_out_gather_plugin.so
lib/vlc/stream_out/libstream_out_mosaic_bridge_plugin.so
lib/vlc/stream_out/libstream_out_rtp_plugin.so
lib/vlc/stream_out/libstream_out_standard_plugin.so
lib/vlc/stream_out/libstream_out_switcher_plugin.so
lib/vlc/stream_out/libstream_out_transcode_plugin.so
lib/vlc/video_chroma/
lib/vlc/video_chroma/libi420_rgb_plugin.so
@ -223,17 +223,29 @@ lib/vlc/video_output/libimage_plugin.so
lib/vlc/video_output/libvout_sdl_plugin.so
lib/vlc/video_output/libx11_plugin.so
lib/vlc/visualization/
share/applications/
share/applications/vlc.desktop
share/doc/vlc/
share/doc/vlc/bugreport-howto.txt
share/doc/vlc/fortunes.txt
share/doc/vlc/intf-cdda.txt
share/doc/vlc/intf-vcd.txt
share/locale/af/LC_MESSAGES/vlc.mo
share/locale/ar/LC_MESSAGES/vlc.mo
share/locale/ca/LC_MESSAGES/vlc.mo
share/locale/co/
share/locale/co/LC_MESSAGES/
share/locale/co/LC_MESSAGES/vlc.mo
share/locale/cs/LC_MESSAGES/vlc.mo
share/locale/da/LC_MESSAGES/vlc.mo
share/locale/de/LC_MESSAGES/vlc.mo
share/locale/en_GB/LC_MESSAGES/vlc.mo
share/locale/es/LC_MESSAGES/vlc.mo
share/locale/eu/LC_MESSAGES/vlc.mo
share/locale/fr/LC_MESSAGES/vlc.mo
share/locale/fur/
share/locale/fur/LC_MESSAGES/
share/locale/fur/LC_MESSAGES/vlc.mo
share/locale/gl/LC_MESSAGES/vlc.mo
share/locale/he/LC_MESSAGES/vlc.mo
share/locale/hi/LC_MESSAGES/vlc.mo
@ -242,14 +254,25 @@ share/locale/it/LC_MESSAGES/vlc.mo
share/locale/ja/LC_MESSAGES/vlc.mo
share/locale/ka/LC_MESSAGES/vlc.mo
share/locale/ko/LC_MESSAGES/vlc.mo
share/locale/lt/LC_MESSAGES/vlc.mo
share/locale/lv/LC_MESSAGES/vlc.mo
share/locale/ms/LC_MESSAGES/vlc.mo
share/locale/nb/LC_MESSAGES/vlc.mo
share/locale/ne/LC_MESSAGES/vlc.mo
share/locale/nl/LC_MESSAGES/vlc.mo
share/locale/nn/LC_MESSAGES/vlc.mo
share/locale/oc/
share/locale/oc/LC_MESSAGES/
share/locale/oc/LC_MESSAGES/vlc.mo
share/locale/pa/LC_MESSAGES/vlc.mo
share/locale/pt_BR/LC_MESSAGES/vlc.mo
share/locale/ro/LC_MESSAGES/vlc.mo
share/locale/ru/LC_MESSAGES/vlc.mo
share/locale/sk/LC_MESSAGES/vlc.mo
share/locale/sl/LC_MESSAGES/vlc.mo
share/locale/sq/LC_MESSAGES/vlc.mo
share/locale/sv/LC_MESSAGES/vlc.mo
share/locale/th/LC_MESSAGES/vlc.mo
share/locale/tr/LC_MESSAGES/vlc.mo
share/locale/zh_CN/LC_MESSAGES/vlc.mo
share/locale/zh_TW/LC_MESSAGES/vlc.mo