haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 19:50:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

remove VLC 2.0.3, add 2.0.5. Builds & runs but is extremely unreliable.

Browse Source
This commit is contained in:
Cian Duffy
2013-03-10 17:35:48 +00:00
parent 7decc76a42
commit 49d33c93e3
3 changed files with 84 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
media-video/vlc/patches/vlc-2.0.3.patch → media-video/vlc/patches/vlc-2.0.5.patch
View File

@@ -1,12 +1,12 @@
--- vlc-2.0.3-orig/configure.ac 2012-07-03 22:55:34.062652416 +0000
+++ vlc-2.0.3/configure.ac 2012-08-04 15:57:48.747110400 +0000
--- vlc-2.0.5-orig/configure.ac 2012-10-22 09:03:51.049545216 +0000
+++ vlc-2.0.5/configure.ac 2012-12-25 23:08:34.519045120 +0000
@@ -279,11 +279,18 @@
SYS=os2
LDFLAGS_save="${LDFLAGS_save} -Zomf -Zbin-files -Zargs-wild"; LDFLAGS="${LDFLAGS_save}"
;;
+ *haiku*)
+ SYS=haiku
+ VLC_ADD_LIBS([libvlccore libvlc vlc],[-lnetwork])
+ VLC_ADD_LIBS([libvlccore libvlc vlc],[-lnetwork -lbe])
+ VLC_ADD_PLUGIN([haiku_aout])
+ VLC_ADD_LIBS([haiku_aout],[-lmedia])
+ ;;
@@ -44,7 +44,16 @@
])
LIBS="$LIBS_save"
AS_IF([test -n "$SOCKET_LIBS"], [
@@ -4162,7 +4175,7 @@
@@ -3110,7 +3123,7 @@
if test "${SYS}" != "darwin"; then
VLC_ADD_PLUGIN([vout_sdl])
fi
- if test "${SYS}" != "mingw32" -a "${SYS}" != "os2"; then
+ if test "${SYS}" != "mingw32" -a "${SYS}" != "haiku"; then
VLC_ADD_LIBS([vout_sdl],[${X_LIBS} ${X_PRE_LIBS} -lX11])
fi
VLC_ADD_CFLAGS([vout_sdl],[${SDL_CFLAGS}])
@@ -4155,7 +4168,7 @@
dnl Stuff used by the program
dnl
VERSION_MESSAGE="${VERSION} ${CODENAME}"
@@ -55,7 +64,7 @@
AC_DEFINE_UNQUOTED(COPYRIGHT_YEARS, "${COPYRIGHT_YEARS}", [The copyright years])
--- vlc-2.0.3-orig/src/modules/bank.c 2011-12-08 18:00:28.032243712 +0000
+++ vlc-2.0.3/src/modules/bank.c 2012-07-30 22:00:12.285736960 +0000
+++ vlc-2.0.5/src/modules/bank.c 2012-07-30 22:00:12.285736960 +0000
@@ -71,28 +71,30 @@
modules.head = module;
}
@@ -109,7 +118,7 @@
/**
* Init bank
--- vlc-2.0.3-orig/include/vlc_threads.h 2012-01-27 23:03:32.051904512 +0000
+++ vlc-2.0.3/include/vlc_threads.h 2012-07-30 22:08:53.845414400 +0000
+++ vlc-2.0.5/include/vlc_threads.h 2012-07-30 22:08:53.845414400 +0000
@@ -124,7 +124,13 @@
typedef pthread_cond_t vlc_cond_t;
#define VLC_STATIC_COND PTHREAD_COND_INITIALIZER
@@ -125,7 +134,7 @@
typedef struct vlc_timer *vlc_timer_t;
--- vlc-2.0.3-orig/include/vlc_fixups.h 2012-01-30 21:37:14.052428800 +0000
+++ vlc-2.0.3/include/vlc_fixups.h 2012-07-30 22:21:46.086245376 +0000
+++ vlc-2.0.5/include/vlc_fixups.h 2012-07-30 22:21:46.086245376 +0000
@@ -246,10 +246,13 @@
#endif
@@ -158,7 +167,7 @@
/* search.h */
#ifndef HAVE_SEARCH_H
--- vlc-2.0.3-orig/bin/override.c 2011-12-08 18:00:25.033554432 +0000
+++ vlc-2.0.3/bin/override.c 2012-07-31 20:19:54.136314880 +0000
+++ vlc-2.0.5/bin/override.c 2012-07-31 20:19:54.136314880 +0000
@@ -124,6 +124,8 @@
*
* Some evil libraries modify the environment. We currently ignore the calls as
@@ -178,7 +187,7 @@
{
if (override)
--- vlc-2.0.3-orig/modules/text_renderer/freetype.c 2012-06-20 18:07:49.059244544 +0000
+++ vlc-2.0.3/modules/text_renderer/freetype.c 2012-08-04 15:22:01.509870080 +0000
+++ vlc-2.0.5/modules/text_renderer/freetype.c 2012-08-04 15:22:01.509870080 +0000
@@ -58,6 +58,9 @@
#elif defined( HAVE_MAEMO )
# define DEFAULT_FONT_FILE "/usr/share/fonts/nokia/nosnb.ttf"
@@ -190,7 +199,7 @@
# define DEFAULT_FONT_FILE "/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf"
# define DEFAULT_FAMILY "Serif Bold"
--- vlc-2.0.3-orig/modules/audio_output/haiku.cpp 1970-01-01 00:00:00.000000000 +0000
+++ vlc-2.0.3/modules/audio_output/haiku.cpp 2012-08-06 23:15:46.251396096 +0000
+++ vlc-2.0.5/modules/audio_output/haiku.cpp 2012-08-06 23:15:46.251396096 +0000
@@ -0,0 +1,197 @@
+/*****************************************************************************
+ * Haiku.cpp - Haiku Media Kit audio output
@@ -390,7 +399,7 @@
+}
+
--- vlc-2.0.3-orig/modules/audio_output/Modules.am 2011-12-08 18:00:26.046923776 +0000
+++ vlc-2.0.3/modules/audio_output/Modules.am 2012-08-04 15:40:24.463208448 +0000
+++ vlc-2.0.5/modules/audio_output/Modules.am 2012-08-04 15:40:24.463208448 +0000
@@ -6,6 +6,7 @@
SOURCES_jack = jack.c
SOURCES_audioqueue = audioqueue.c
@@ -400,7 +409,7 @@
libadummy_plugin_la_SOURCES = adummy.c
libadummy_plugin_la_CFLAGS = $(AM_CFLAGS)
--- vlc-2.0.3-orig/src/haiku/specific.cpp 1970-01-01 00:00:00.000000000 +0000
+++ vlc-2.0.3/src/haiku/specific.cpp 2012-08-05 12:18:40.333185024 +0000
+++ vlc-2.0.5/src/haiku/specific.cpp 2012-08-05 12:18:40.333185024 +0000
@@ -0,0 +1,57 @@
+/*****************************************************************************
+ * specific.c: stubs for POSIX OS-specific initialization
@@ -460,7 +469,7 @@
+}
+}
--- vlc-2.0.3-orig/src/Makefile.am 2012-05-15 12:41:19.024641536 +0000
+++ vlc-2.0.3/src/Makefile.am 2012-08-05 01:50:39.982253568 +0000
+++ vlc-2.0.5/src/Makefile.am 2012-08-05 01:50:39.982253568 +0000
@@ -221,6 +221,9 @@
if HAVE_OS2
libvlccore_la_SOURCES += $(SOURCES_libvlc_os2)
@@ -498,7 +507,7 @@
misc/atomic.c \
--- vlc-2.0.3-orig/modules/gui/qt4/qt4.cpp 2012-07-02 00:47:23.031457280 +0000
+++ vlc-2.0.3/modules/gui/qt4/qt4.cpp 2012-12-11 21:52:28.551288832 +0000
+++ vlc-2.0.5/modules/gui/qt4/qt4.cpp 2012-12-11 21:52:28.551288832 +0000
@@ -628,7 +628,7 @@
if( !p_wnd->handle.hwnd )
return VLC_EGENERIC;
@@ -510,7 +519,7 @@
return VLC_EGENERIC;
--- vlc-2.0.3-orig/src/network/io.c 2012-04-27 17:14:57.020709376 +0000
+++ vlc-2.0.3/src/network/io.c 2012-12-11 21:34:34.143392768 +0000
+++ vlc-2.0.5/src/network/io.c 2012-12-11 21:34:34.143392768 +0000
@@ -215,7 +215,9 @@
switch (ptr->ai_socktype)
{
@@ -521,3 +530,23 @@
case SOCK_SEQPACKET:
#ifdef SOCK_DCCP
case SOCK_DCCP:
--- vlc-2.0.5-orig/modules/video_output/sdl.c 2011-12-08 18:00:27.022282240 +0000
+++ vlc-2.0.5/modules/video_output/sdl.c 2012-12-20 21:47:16.280494080 +0000
@@ -40,7 +40,7 @@
#include <SDL.h>
-#if !defined(WIN32) && !defined(__OS2__)
+#if !defined(WIN32) && !defined(__OS2__) && !defined(__HAIKU__)
# ifdef X_DISPLAY_MISSING
# error Xlib required due to XInitThreads
# endif
@@ -116,7 +116,7 @@
vout_display_t *vd = (vout_display_t *)object;
vout_display_sys_t *sys;
-#if !defined(WIN32) && !defined(__OS2__)
+#if !defined(WIN32) && !defined(__OS2__) && !defined(__HAIKU__)
if (!vlc_xlib_init (object))
return VLC_EGENERIC;
#endif

38
media-video/vlc/vlc-2.0.3.bep
View File

@@ -1,38 +0,0 @@
DESCRIPTION="vlc - media player"
HOMEPAGE="http://www.videolan.org/vlc/"
SRC_URI="http://download.videolan.org/pub/videolan/vlc/2.0.3/vlc-2.0.3.tar.xz"
REVISION="2"
STATUS_HAIKU="broken"
MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
DEPEND="faad2,
libdca,
libdvdnav >= 4.2.0,
libmatroska,
libmad,
a52dec,
schroedinger,
twolame,
lua >= 5.1.4,
taglib >= 1.7,
libbluray,
lame >= 3.98.4,
libgcrypt,
libcddb,
x264,
flac,
ffmpeg = 0.10.2-vlc"
CHECKSUM_MD5="a7e79565e3df07dcf9abc6cad3ac26bb"
BUILD {
cd vlc-2.0.3
bootstrap
./configure --prefix=`finddir B_COMMON_DIRECTORY` --enable-sdl=no --with-kde-solid=no --disable-xcb --enable-run-as-root
make
}
INSTALL {
cd vlc-2.0.3
make install
}
LICENSE="GNU GPL v2"
COPYRIGHT="1998-2012"

40
media-video/vlc/vlc-2.0.5.bep Normal file
View File

@@ -0,0 +1,40 @@
DESCRIPTION="vlc - media player"
HOMEPAGE="http://www.videolan.org/vlc/"
SRC_URI="http://download.videolan.org/pub/videolan/vlc/2.0.5/vlc-2.0.5.tar.xz"
REVISION="1"
STATUS_HAIKU="unstable"
MESSAGE="This port only builds on gcc4 systems"
DEPEND="faad2,
libdca,
libdvdnav >= 4.2.0,
libmatroska,
libmad,
a52dec,
schroedinger,
twolame,
lua >= 5.1.4,
taglib >= 1.7,
libbluray,
lame >= 3.98.4,
libgcrypt,
libcddb,
x264,
flac,
ffmpeg = 0.10.2-vlc
libsdl
sdl-image"
CHECKSUM_MD5="4f959c0766ada8cea5a72c65fce94ebe"
BUILD {
cd vlc-2.0.5
bootstrap
./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-kde-solid=no --disable-xcb --enable-run-as-root --enable-static
make
}
INSTALL {
cd vlc-2.0.5
make install
}
LICENSE="GNU GPL v2"
COPYRIGHT="1998-2012"