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

maintainence update to 0.8.6d

Browse Source 
from brad@
This commit is contained in:
jakemsr 2007-12-11 11:07:54 +00:00
parent a9ba552d48
commit 5759613568
9 changed files with 46 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
x11/vlc/Makefile
View File

@ -1,12 +1,12 @@
# $OpenBSD: Makefile,v 1.62 2007/11/25 14:21:57 bernd Exp $
# $OpenBSD: Makefile,v 1.63 2007/12/11 11:07:54 jakemsr Exp $
SHARED_ONLY= Yes
COMMENT-main= videolan client; multimedia player
V= 0.8.6c
V= 0.8.6d
DISTNAME= vlc-${V}
PKGNAME-main= ${DISTNAME}p7
PKGNAME-main= ${DISTNAME}
CATEGORIES= x11
MASTER_SITES= http://download.videolan.org/pub/videolan/vlc/${V}/
@ -191,7 +191,7 @@ CONFIGURE_ARGS+=--enable-arts
LIB_DEPENDS-arts=${LIB_DEPENDS} artsc.>=1::x11/kde/arts3
# any FLAVOR of vlc will do
RUN_DEPENDS-arts=::x11/vlc
WANTLIB-arts= glib-2.0 gmodule-2.0 gthread-2.0 stdc++ pthread
WANTLIB-arts= glib-2.0 gmodule-2.0 gthread-2.0 stdc++ pcre pthread
.else
CONFIGURE_ARGS+=--disable-arts
.endif

10
x11/vlc/distinfo
View File

@ -1,5 +1,5 @@
MD5 (vlc-0.8.6c.tar.gz) = Pl89eXOHSjZVT7DIx3/GPg==
RMD160 (vlc-0.8.6c.tar.gz) = +DlMIMwkH4RfOAebsqrJdXmETX4=
SHA1 (vlc-0.8.6c.tar.gz) = pbflmIHPdXiQJn7kTBLmTAcqCRg=
SHA256 (vlc-0.8.6c.tar.gz) = taM7pe2uO2BVOLjmjZXWqxRM+U62piWF9cZbVpMb7Uc=
SIZE (vlc-0.8.6c.tar.gz) = 16234243
MD5 (vlc-0.8.6d.tar.gz) = Qk60levWTV209l+8yJTgvA==
RMD160 (vlc-0.8.6d.tar.gz) = AiiDaIyKJxaDPsOB2otGQDhQGuw=
SHA1 (vlc-0.8.6d.tar.gz) = pMHg+ijNfhPuFtkOSpOS0eU+WkE=
SHA256 (vlc-0.8.6d.tar.gz) = wg5UeCr5yKrPewNo2zvXpzwG3vAn5BpmRfyjxcl/TxI=
SIZE (vlc-0.8.6d.tar.gz) = 16286700

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

@ -1,45 +0,0 @@
$OpenBSD: patch-aclocal_m4,v 1.6 2007/06/05 01:53:04 jolan Exp $
--- aclocal.m4.orig Tue Apr 17 17:46:03 2007
+++ aclocal.m4 Fri May 11 23:51:38 2007
@@ -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
@@ -8755,9 +8755,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
@@ -8777,9 +8777,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

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

@ -1,7 +1,7 @@
$OpenBSD: patch-configure_ac,v 1.9 2007/06/18 23:14:20 ajacoutot Exp $
--- configure.ac.orig Sat Jun 16 10:25:19 2007
+++ configure.ac Mon Jun 18 17:34:39 2007
@@ -210,7 +210,7 @@ case "${target_os}" in
$OpenBSD: patch-configure_ac,v 1.10 2007/12/11 11:07:54 jakemsr Exp $
--- configure.ac.orig Tue Nov 27 08:11:35 2007
+++ configure.ac Sat Dec 1 22:31:03 2007
@@ -198,7 +198,7 @@ case "${target_os}" in
VLC_ADD_CFLAGS([libvlc],[-x objective-c])
VLC_ADD_CFLAGS([vlc],[-x objective-c])
;;
@ -10,7 +10,7 @@ $OpenBSD: patch-configure_ac,v 1.9 2007/06/18 23:14:20 ajacoutot Exp $
AC_CHECK_TOOL(WINDRES, windres, :)
case "${target_os}" in
@@ -226,7 +226,7 @@ case "${target_os}" in
@@ -214,7 +214,7 @@ case "${target_os}" in
#endif],
SYS=mingw32, SYS=cygwin)
;;
@ -19,7 +19,7 @@ $OpenBSD: patch-configure_ac,v 1.9 2007/06/18 23:14:20 ajacoutot Exp $
SYS=mingwce
;;
esac
@@ -664,6 +664,9 @@ if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"
@@ -656,6 +656,9 @@ if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"
dnl Check for pthreads - borrowed from XMMS
THREAD_LIB=error
if test "${THREAD_LIB}" = "error"; then
@ -29,7 +29,7 @@ $OpenBSD: patch-configure_ac,v 1.9 2007/06/18 23:14:20 ajacoutot Exp $
AC_CHECK_LIB(pthread,main,THREAD_LIB="-lpthread")
fi
if test "${THREAD_LIB}" = "error"; then
@@ -2695,7 +2698,7 @@ dnl Look for a ffmpeg-config (we are on debian )
@@ -2693,7 +2696,7 @@ dnl Look for a ffmpeg-config (we are on debian )
else
dnl Trying with pkg-config
@ -38,7 +38,7 @@ $OpenBSD: patch-configure_ac,v 1.9 2007/06/18 23:14:20 ajacoutot Exp $
[
AC_CHECK_HEADERS(ffmpeg/avcodec.h, [], [AC_MSG_ERROR([Missing header file ffmpeg/avcodec.h.])] )
AC_CHECK_HEADERS(ffmpeg/avformat.h)
@@ -3357,13 +3360,13 @@ AC_ARG_ENABLE(png,
@@ -3355,13 +3358,13 @@ AC_ARG_ENABLE(png,
[ --enable-png PNG support (default enabled)])
if test "${enable_png}" != "no"; then
AC_CHECK_HEADERS(png.h, [

12
x11/vlc/patches/patch-modules_audio_output_Makefile_in
View File

@ -1,15 +1,15 @@
$OpenBSD: patch-modules_audio_output_Makefile_in,v 1.1 2007/11/11 01:37:54 jakemsr Exp $
--- modules/audio_output/Makefile.in.orig Sat Jun 16 07:26:01 2007
+++ modules/audio_output/Makefile.in Wed Oct 3 12:53:07 2007
@@ -381,6 +381,7 @@ libarts_plugin_la_LDFLAGS = `$(VLC_CONFIG) --libs plug
$OpenBSD: patch-modules_audio_output_Makefile_in,v 1.2 2007/12/11 11:07:54 jakemsr Exp $
--- modules/audio_output/Makefile.in.orig Tue Nov 27 14:23:14 2007
+++ modules/audio_output/Makefile.in Sat Dec 1 23:27:42 2007
@@ -713,6 +713,7 @@ libarts_plugin_la_LDFLAGS = `$(VLC_CONFIG) --libs plug
-rpath '$(libvlcdir)' -avoid-version -module -shrext $(LIBEXT)
libarts_plugin_la_LIBADD = $(LTLIBVLC)
+libarts_plugin_la_EXTRALIBS = -lstdc++
libarts_a_SOURCES = $(SOURCES_arts)
libarts_builtin_la_SOURCES = $(SOURCES_arts)
@@ -3173,7 +3174,7 @@ all-modules:
libarts_a_CFLAGS = `$(VLC_CONFIG) --cflags builtin pic arts`
@@ -2065,7 +2066,7 @@ all-modules:
# Build a plugin with the adequate linker and linker's flags
_plugin.a_plugin$(LIBEXT):

16
x11/vlc/patches/patch-modules_demux_Makefile_in
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-modules_demux_Makefile_in,v 1.3 2007/06/05 01:53:04 jolan Exp $
--- modules/demux/Makefile.in.orig Tue Apr 17 17:46:43 2007
+++ modules/demux/Makefile.in Fri May 11 23:51:39 2007
@@ -1777,7 +1777,7 @@ LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS
$OpenBSD: patch-modules_demux_Makefile_in,v 1.4 2007/12/11 11:07:54 jakemsr Exp $
--- modules/demux/Makefile.in.orig Tue Nov 27 14:23:24 2007
+++ modules/demux/Makefile.in Sat Dec 1 22:36:40 2007
@@ -626,7 +626,7 @@ LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(C
$(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) \
CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -lstdc++ -o $@
SOURCES = $(liba52sys_a_SOURCES) $(liba52sys_plugin_a_SOURCES) \
$(libaiff_a_SOURCES) $(libaiff_plugin_a_SOURCES) \
$(libau_a_SOURCES) $(libau_plugin_a_SOURCES) \

16
x11/vlc/patches/patch-modules_gui_wxwidgets_Makefile_in
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-modules_gui_wxwidgets_Makefile_in,v 1.3 2007/06/05 01:53:04 jolan Exp $
--- modules/gui/wxwidgets/Makefile.in.orig Tue Apr 17 17:46:57 2007
+++ modules/gui/wxwidgets/Makefile.in Fri May 11 23:51:38 2007
@@ -718,7 +718,7 @@ LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS
$OpenBSD: patch-modules_gui_wxwidgets_Makefile_in,v 1.4 2007/12/11 11:07:54 jakemsr Exp $
--- modules/gui/wxwidgets/Makefile.in.orig Tue Nov 27 14:23:36 2007
+++ modules/gui/wxwidgets/Makefile.in Sat Dec 1 22:37:33 2007
@@ -213,7 +213,7 @@ LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(C
$(AM_CXXFLAGS) $(CXXFLAGS)
CXXLD = $(CXX)
CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ $(AM_LDFLAGS) $(LDFLAGS) -lstdc++ -o $@
CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ $(CXXFLAGS) $(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) \
LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \

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

@ -1,7 +1,7 @@
$OpenBSD: patch-share_Makefile_in,v 1.3 2007/06/05 01:53:04 jolan Exp $
--- share/Makefile.in.orig Tue Apr 17 17:47:19 2007
+++ share/Makefile.in Fri May 11 23:51:38 2007
@@ -813,7 +813,6 @@ skins2/default.vlt: $(skins2_default_vlt_FILES)
$OpenBSD: patch-share_Makefile_in,v 1.4 2007/12/11 11:07:54 jakemsr Exp $
--- share/Makefile.in.orig Tue Nov 27 14:23:56 2007
+++ share/Makefile.in Sat Dec 1 22:31:03 2007
@@ -848,7 +848,6 @@ skins2/default.vlt: $(skins2_default_vlt_FILES)
skins2/default.vlt:
mkdir -p skins2

4
x11/vlc/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.2 2007/11/25 14:21:57 bernd Exp $
@comment $OpenBSD: PLIST-main,v 1.3 2007/12/11 11:07:54 jakemsr Exp $
@pkgpath x11/vlc
%%altivec%%
%%win32%%
@ -272,6 +272,7 @@ share/locale/nl/LC_MESSAGES/vlc.mo
share/locale/nn/LC_MESSAGES/vlc.mo
share/locale/oc/LC_MESSAGES/vlc.mo
share/locale/pa/LC_MESSAGES/vlc.mo
share/locale/pl/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
@ -324,6 +325,7 @@ share/vlc/http/images/slider_left.png
share/vlc/http/images/slider_point.png
share/vlc/http/images/slider_right.png
share/vlc/http/images/slow.png
share/vlc/http/images/snapshot.png
share/vlc/http/images/sort.png
share/vlc/http/images/sout.png
share/vlc/http/images/speaker.png