mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-30 03:58:51 +02:00
VLC: enabled most of the deps
Video output works now in an external SDL window Audio output plugin needs to be updated to a new API Added resource file with vector icon
This commit is contained in:
Sergei Reznikov
47
media-video/vlc/additional-files/vlc.rdef
Normal file
47
media-video/vlc/additional-files/vlc.rdef
Normal file
@@ -0,0 +1,47 @@
|
||||
|
||||
resource app_flags B_SINGLE_LAUNCH | B_ARGV_ONLY;
|
||||
|
||||
resource app_version {
|
||||
major = 2,
|
||||
middle = 2,
|
||||
minor = 1,
|
||||
|
||||
variety = B_APPV_FINAL,
|
||||
internal = 0,
|
||||
|
||||
short_info = "VideoLAN Client",
|
||||
long_info = "A multi-platform multimedia player."
|
||||
};
|
||||
|
||||
resource app_signature "application/x-vnd.vlc";
|
||||
|
||||
resource file_types message {
|
||||
"types" = "application/x-asf",
|
||||
"types" = "audio",
|
||||
"types" = "video"
|
||||
};
|
||||
|
||||
resource vector_icon {
|
||||
$"6E6369660A0500020006023B69C90000000000003B23A04AC3EF4AE6A9007C45"
|
||||
$"03FFD3893303F2A541020006033D79BF0000000000003D324D49E2A74A24F500"
|
||||
$"FFE8CF7FD18021FFF49119020006023AB37E0000000000003D324D4B3D534961"
|
||||
$"EB00A94604FFDC7D0B020016033B480D0000000000003AC58F49C2784A87EA00"
|
||||
$"FF7FCCFFE4020006033BDD210000000000003B67CD49C2A749821E00FFE8CF7F"
|
||||
$"B96205FFD47505020006033AA07A0000000000003A50B649C2784A547F00FFE8"
|
||||
$"CF7FC36E0AFFEA87130200060338E8A800000000000038905449C28F47E0EE00"
|
||||
$"FFE8CF7FC57210FFF491190401780C0605E202426045574E6048604A60465746"
|
||||
$"0605F2032E484C42B54E42B54EC06FB49E3D22BFB322BD632238B54EBCA8B49B"
|
||||
$"38B54E0A063A3C224C224E425E584858460A073F523F42C738C1713A3C224C42"
|
||||
$"5BC60BC5400A055846C738C1713F423F52C60BC5400A04425E425B584658480A"
|
||||
$"04224E224C425B425E02062EC3102EC3102EC4993D52345246524CC3104CC499"
|
||||
$"4CC310C3A2BFF9C3A2BFF949C18B3D4744473647B978BFFE31C18BB978BFFE02"
|
||||
$"063D4736474447C3A2BFF94AC128C3A2BFF9C2C4BD00C2C4BD0047BE1B3D3E43"
|
||||
$"3E373EBA5939BA85BE1BBA5939B978BFFEB978BFFE30C1280206C2C4BD0047BE"
|
||||
$"1BC2C4BD00C1E3B9F8C1E3B9F845BB0D3D3542353835BB36B9FB35BB0DBB36B9"
|
||||
$"FBBA5939BA593933BE1B3D3E373E433E0206C1E3B9F845BB0DC1E3B9F8C13CB7"
|
||||
$"B4C13CB7B443B8613D2E412E392EBBE2B7A337B861BBE2B7A3BB36B9FBBB36B9"
|
||||
$"FB35BB0D3D35383542350206C13CB7B443B861C13CB7B442B55342B553C06FB4"
|
||||
$"A03D22BFB322BD632238B553BCA8B49E38B553BBE2B7A3BBE2B7A337B8613D2E"
|
||||
$"392E412E0A0A090100000A000201021001178400040A010105000A020106000A"
|
||||
$"030103000A040104000A060107000A070109000A0502080A000A08010B00"
|
||||
};
|
||||
@@ -1,552 +0,0 @@
|
||||
--- 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 -lbe])
|
||||
+ VLC_ADD_PLUGIN([haiku_aout])
|
||||
+ VLC_ADD_LIBS([haiku_aout],[-lmedia])
|
||||
+ ;;
|
||||
*)
|
||||
SYS="${host_os}"
|
||||
;;
|
||||
esac
|
||||
AM_CONDITIONAL(HAVE_DARWIN, test "${SYS}" = "darwin")
|
||||
+AM_CONDITIONAL(HAVE_HAIKU, test "${SYS}" = "haiku")
|
||||
AM_CONDITIONAL(HAVE_LINUX, test "${SYS}" = "linux")
|
||||
AM_CONDITIONAL(HAVE_OS2, test "${SYS}" = "os2")
|
||||
AM_CONDITIONAL(HAVE_WIN32, test "${SYS}" = "mingw32")
|
||||
@@ -513,10 +520,13 @@
|
||||
dnl Check for system libs needed
|
||||
need_libc=false
|
||||
|
||||
+#this fails to detect that we have if_nameindex and if_nametoindex on haiku
|
||||
+#and then it dails to detect that we don't have tdestroy...
|
||||
+
|
||||
dnl Check for usual libc functions
|
||||
AC_CHECK_DECLS([nanosleep],,,[#include <time.h>])
|
||||
AC_CHECK_FUNCS([daemon fcntl fstatvfs fork getenv getpwuid_r if_nameindex if_nametoindex isatty lstat memalign mmap openat pread posix_fadvise posix_madvise setlocale stricmp strnicmp strptime uselocale])
|
||||
-AC_REPLACE_FUNCS([atof atoll dirfd fdopendir flockfile fsync getdelim getpid gmtime_r inet_pton lldiv localtime_r nrand48 rewind setenv strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtok_r strtoll swab tdestroy])
|
||||
+AC_REPLACE_FUNCS([atof atoll dirfd fdopendir flockfile fsync getdelim getpid gmtime_r inet_pton lldiv localtime_r nrand48 rewind setenv strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtok_r strtoll swab])
|
||||
AC_CHECK_FUNCS(fdatasync,,
|
||||
[AC_DEFINE(fdatasync, fsync, [Alias fdatasync() to fsync() if missing.])
|
||||
])
|
||||
@@ -578,6 +588,9 @@
|
||||
AS_IF([test "${SYS}" = "mingwce"], [
|
||||
SOCKET_LIBS="-lws2"
|
||||
])
|
||||
+ AS_IF([test "${SYS}" = "haiku"], [
|
||||
+ SOCKET_LIBS="-lnetwork"
|
||||
+ ])
|
||||
])
|
||||
LIBS="$LIBS_save"
|
||||
AS_IF([test -n "$SOCKET_LIBS"], [
|
||||
@@ -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}"
|
||||
-COPYRIGHT_MESSAGE="Copyright © ${COPYRIGHT_YEARS} VLC authors and VideoLAN"
|
||||
+COPYRIGHT_MESSAGE="Copyright (C) ${COPYRIGHT_YEARS} VLC authors and VideoLAN"
|
||||
AC_DEFINE_UNQUOTED(VERSION_MESSAGE, "${VERSION_MESSAGE}", [Simple version string])
|
||||
AC_DEFINE_UNQUOTED(COPYRIGHT_MESSAGE, "${COPYRIGHT_MESSAGE}", [Copyright string])
|
||||
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.5/src/modules/bank.c 2012-07-30 22:00:12.285736960 +0000
|
||||
@@ -71,28 +71,30 @@
|
||||
modules.head = module;
|
||||
}
|
||||
|
||||
-#ifdef __ELF__
|
||||
-# ifdef __GNUC__
|
||||
-__attribute__((weak))
|
||||
-# else
|
||||
-# pragma weak vlc_static_modules
|
||||
-# endif
|
||||
-extern vlc_plugin_cb vlc_static_modules[];
|
||||
-
|
||||
-static void module_InitStaticModules(void)
|
||||
-{
|
||||
- if (!vlc_static_modules)
|
||||
- return;
|
||||
-
|
||||
- for (unsigned i = 0; vlc_static_modules[i]; i++) {
|
||||
- module_t *module = module_InitStatic (vlc_static_modules[i]);
|
||||
- if (likely(module != NULL))
|
||||
- module_StoreBank (module);
|
||||
- }
|
||||
-}
|
||||
-#else
|
||||
+//Haiku bug #8288
|
||||
+//#ifdef __ELF__
|
||||
+//# ifdef __GNUC__
|
||||
+//__attribute__((weak))
|
||||
+//# else
|
||||
+//# pragma weak vlc_static_modules
|
||||
+//# endif
|
||||
+//extern vlc_plugin_cb vlc_static_modules[];
|
||||
+//
|
||||
+//static void module_InitStaticModules(void)
|
||||
+//{
|
||||
+// if (!vlc_static_modules)
|
||||
+// return;
|
||||
+//
|
||||
+// for (unsigned i = 0; vlc_static_modules[i]; i++) {
|
||||
+// module_t *module = module_InitStatic (vlc_static_modules[i]);
|
||||
+// if (likely(module != NULL))
|
||||
+// module_StoreBank (module);
|
||||
+// }
|
||||
+//}
|
||||
+//#else
|
||||
static void module_InitStaticModules(void) { }
|
||||
-#endif
|
||||
+//#endif
|
||||
+
|
||||
|
||||
/**
|
||||
* Init bank
|
||||
--- vlc-2.0.3-orig/include/vlc_threads.h 2012-01-27 23:03:32.051904512 +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
|
||||
typedef pthread_rwlock_t vlc_rwlock_t;
|
||||
+// Haiku bug #8798
|
||||
+#ifdef __HAIKU__
|
||||
+#define VLC_STATIC_RWLOCK \
|
||||
+ { VLC_STATIC_MUTEX, VLC_STATIC_COND, 0, 0, 0 }
|
||||
+#else
|
||||
#define VLC_STATIC_RWLOCK PTHREAD_RWLOCK_INITIALIZER
|
||||
+#endif
|
||||
typedef pthread_key_t vlc_threadvar_t;
|
||||
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.5/include/vlc_fixups.h 2012-07-30 22:21:46.086245376 +0000
|
||||
@@ -246,10 +246,13 @@
|
||||
#endif
|
||||
|
||||
/* Socket stuff */
|
||||
+// configure doesn't detect these, likely not linking to -lnetwork, must investigate
|
||||
+#ifndef __HAIKU__
|
||||
#ifndef HAVE_INET_PTON
|
||||
int inet_pton(int, const char *, void *);
|
||||
const char *inet_ntop(int, const void *, char *, int);
|
||||
#endif
|
||||
+#endif
|
||||
|
||||
#ifndef HAVE_STRUCT_POLLFD
|
||||
enum
|
||||
@@ -276,6 +279,8 @@
|
||||
# define poll(a, b, c) vlc_poll(a, b, c)
|
||||
#endif
|
||||
|
||||
+// or these
|
||||
+#ifndef __HAIKU__
|
||||
#ifndef HAVE_IF_NAMEINDEX
|
||||
#include <errno.h>
|
||||
struct if_nameindex
|
||||
@@ -289,6 +294,7 @@
|
||||
# define if_nameindex() (errno = ENOBUFS, NULL)
|
||||
# define if_freenameindex(list) (void)0
|
||||
#endif
|
||||
+#endif
|
||||
|
||||
/* 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.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
|
||||
* they could crash the process. This may cause funny behaviour though. */
|
||||
+#ifndef __HAIKU__
|
||||
+//not working
|
||||
int putenv (char *str)
|
||||
{
|
||||
if (override)
|
||||
@@ -133,7 +135,7 @@
|
||||
}
|
||||
return CALL(putenv, str);
|
||||
}
|
||||
-
|
||||
+#endif
|
||||
int setenv (const char *name, const char *value, int overwrite)
|
||||
{
|
||||
if (override)
|
||||
--- vlc-2.0.3-orig/modules/text_renderer/freetype.c 2012-06-20 18:07:49.059244544 +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"
|
||||
# define DEFAULT_FAMILY "Nokia Sans Bold"
|
||||
+#elif defined(__HAIKU__)
|
||||
+# define DEFAULT_FONT_FILE "/boot/system/data/fonts/ttfonts/DejaVuSans.ttf"
|
||||
+# define DEFAULT_FAMILY "DejaVu Sans"
|
||||
#else
|
||||
# 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.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
|
||||
+ *****************************************************************************
|
||||
+ * Copyright (C) 1999, 2000, 2001, 2012 the VideoLAN team
|
||||
+ *
|
||||
+ * Authors: Jean-Marc Dressler <polux@via.ecp.fr>
|
||||
+ * Samuel Hocevar <sam@zoy.org>
|
||||
+ * Eric Petit <titer@videolan.org>
|
||||
+ * Cian Duffy <myob87@gmail.com>
|
||||
+ *
|
||||
+ * 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
|
||||
+ *****************************************************************************/
|
||||
+
|
||||
+/*****************************************************************************
|
||||
+ * Preamble
|
||||
+ *****************************************************************************/
|
||||
+#include <stdio.h>
|
||||
+#include <stdlib.h> /* malloc(), free() */
|
||||
+#include <malloc.h>
|
||||
+#include <string.h>
|
||||
+
|
||||
+#include <iostream>
|
||||
+#include <queue>
|
||||
+using namespace std;
|
||||
+
|
||||
+#include <SoundPlayer.h>
|
||||
+#include <media/MediaDefs.h>
|
||||
+
|
||||
+#ifdef HAVE_CONFIG_H
|
||||
+# include "config.h"
|
||||
+#endif
|
||||
+
|
||||
+#include <vlc_aout.h>
|
||||
+#include <vlc_common.h>
|
||||
+#include <vlc_plugin.h>
|
||||
+
|
||||
+/*****************************************************************************
|
||||
+ * aout_sys_t: BeOS audio output method descriptor
|
||||
+ *****************************************************************************/
|
||||
+
|
||||
+queue<uint8> a_queue;
|
||||
+
|
||||
+struct aout_sys_t
|
||||
+{
|
||||
+ BSoundPlayer * p_player;
|
||||
+ mtime_t latency;
|
||||
+ media_raw_audio_format * p_format;
|
||||
+};
|
||||
+
|
||||
+/*****************************************************************************
|
||||
+ * Local prototypes.
|
||||
+ *****************************************************************************/
|
||||
+static void Close ( vlc_object_t * );
|
||||
+static void Pause (audio_output_t *, bool, mtime_t);
|
||||
+static void Play (audio_output_t *, block_t *);
|
||||
+
|
||||
+static void Flush (audio_output_t *, bool);static int Open ( vlc_object_t * );
|
||||
+static void BufferProc ( void * p_aout, void * p_buffer, size_t size,
|
||||
+ const media_raw_audio_format & format );
|
||||
+
|
||||
+/*****************************************************************************
|
||||
+ * Module descriptor
|
||||
+ *****************************************************************************/
|
||||
+vlc_module_begin ()
|
||||
+ set_shortname( "haiku_aout" )
|
||||
+ set_description( N_("Haiku Media Kit audio output") )
|
||||
+ set_capability( "audio output", 100 )
|
||||
+ set_category( CAT_AUDIO )
|
||||
+ set_subcategory( SUBCAT_AUDIO_AOUT )
|
||||
+ set_callbacks( Open, Close )
|
||||
+vlc_module_end ()
|
||||
+/*****************************************************************************
|
||||
+ * OpenAudio
|
||||
+ *****************************************************************************/
|
||||
+static int Open( vlc_object_t * p_this )
|
||||
+{
|
||||
+ audio_output_t *p_aout = (audio_output_t *)p_this;
|
||||
+ p_aout->sys = (aout_sys_t*)malloc( sizeof( aout_sys_t ) );
|
||||
+ if( p_aout->sys == NULL )
|
||||
+ {
|
||||
+ return VLC_ENOMEM;
|
||||
+ }
|
||||
+
|
||||
+ aout_sys_t * p_sys = p_aout->sys;
|
||||
+
|
||||
+ audio_format_t format = p_aout->format;
|
||||
+
|
||||
+ int i_nb_channels = aout_FormatNbChannels( &format );
|
||||
+
|
||||
+// media_raw_audio_format must be passed to BSoundPlayer
|
||||
+ p_sys->p_format = (media_raw_audio_format*)
|
||||
+ malloc( sizeof( media_raw_audio_format ) );
|
||||
+
|
||||
+ p_aout->format.i_format = VLC_CODEC_FI32;
|
||||
+ p_aout->format.i_physical_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT;
|
||||
+ p_aout->format.i_rate = 44100;
|
||||
+
|
||||
+ p_sys->p_format->channel_count = i_nb_channels;
|
||||
+ p_sys->p_format->frame_rate = p_aout->format.i_rate;
|
||||
+ p_sys->p_format->format = media_raw_audio_format::B_AUDIO_INT;
|
||||
+ p_sys->p_format->byte_order = B_MEDIA_LITTLE_ENDIAN;
|
||||
+ // 'magic' number obtained from checking what size the buffers being
|
||||
+ // passed by the callback were
|
||||
+ // in theory, any buffer size should work
|
||||
+ p_sys->p_format->buffer_size = 9216;
|
||||
+
|
||||
+ aout_VolumeSoftInit( p_aout );
|
||||
+
|
||||
+ //BSoundPlayer init - format, name, buffer producer, notifier, cookie
|
||||
+
|
||||
+ p_sys->p_player = new BSoundPlayer( p_sys->p_format, "player", BufferProc, NULL, NULL );
|
||||
+ if( p_sys->p_player->InitCheck() != B_OK )
|
||||
+ {
|
||||
+ msg_Err( p_aout, "BSoundPlayer InitCheck failed" );
|
||||
+ delete p_sys->p_player;
|
||||
+ free( p_sys );
|
||||
+ }
|
||||
+ p_sys->latency = p_sys->p_player->Latency();
|
||||
+
|
||||
+ p_aout->pf_play = Play;
|
||||
+ p_aout->pf_pause = Pause;
|
||||
+ p_aout->pf_flush = Flush;
|
||||
+
|
||||
+ return VLC_SUCCESS;
|
||||
+
|
||||
+}
|
||||
+
|
||||
+/*****************************************************************************
|
||||
+ * BufferProc- buffer producer function
|
||||
+ *****************************************************************************/
|
||||
+static void BufferProc( void * _p_aout, void * _p_buffer, size_t i_size,
|
||||
+ const media_raw_audio_format &format )
|
||||
+{
|
||||
+// Load buffer
|
||||
+ for (size_t i = 0; i < i_size; i++)
|
||||
+ {
|
||||
+ uint8 data = a_queue.front();
|
||||
+ vlc_memset(_p_buffer + i, data, 1);
|
||||
+ a_queue.pop();
|
||||
+ }
|
||||
+
|
||||
+}
|
||||
+/*****************************************************************************
|
||||
+ * CloseAudio
|
||||
+ *****************************************************************************/
|
||||
+static void Close( vlc_object_t * p_this )
|
||||
+{
|
||||
+ printf("Close Called");
|
||||
+ audio_output_t *p_aout = (audio_output_t *)p_this;
|
||||
+ struct aout_sys_t *p_sys;
|
||||
+ p_aout->sys = p_sys;
|
||||
+
|
||||
+ /* Clean up */
|
||||
+ p_sys->p_player->Stop();
|
||||
+ delete p_sys->p_player;
|
||||
+ free( p_sys );
|
||||
+}
|
||||
+
|
||||
+
|
||||
+static void Play (audio_output_t *aout, block_t *block)
|
||||
+{
|
||||
+ aout_sys_t * p_sys = aout->sys;
|
||||
+
|
||||
+// load buffer to STL queue, sample by sample
|
||||
+ for (size_t i = 0; i < block->i_buffer; i++)
|
||||
+ {
|
||||
+ a_queue.push(block->p_buffer[i]);
|
||||
+ }
|
||||
+
|
||||
+ p_sys->p_player->Start();
|
||||
+ p_sys->p_player->SetHasData( true );
|
||||
+// release buffer
|
||||
+ block_Release (block);
|
||||
+}
|
||||
+
|
||||
+
|
||||
+static void Pause (audio_output_t *aout, bool pause, mtime_t date)
|
||||
+{
|
||||
+}
|
||||
+
|
||||
+
|
||||
+static void Flush (audio_output_t *aout, bool wait)
|
||||
+{
|
||||
+}
|
||||
+
|
||||
--- vlc-2.0.3-orig/modules/audio_output/Modules.am 2011-12-08 18:00:26.046923776 +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
|
||||
SOURCES_opensles_android = opensles_android.c
|
||||
+SOURCES_haiku_aout = haiku.cpp
|
||||
|
||||
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.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
|
||||
+ *****************************************************************************
|
||||
+ * Copyright © 2008 Rémi Denis-Courmont
|
||||
+ *
|
||||
+ * This program is free software; you can redistribute it and/or modify it
|
||||
+ * under the terms of the GNU Lesser General Public License as published by
|
||||
+ * the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details.
|
||||
+ *
|
||||
+ * You should have received a copy of the GNU Lesser General Public License
|
||||
+ * along with this program; if not, write to the Free Software Foundation,
|
||||
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
|
||||
+ *****************************************************************************/
|
||||
+
|
||||
+#ifdef HAVE_CONFIG_H
|
||||
+# include "config.h"
|
||||
+#endif
|
||||
+
|
||||
+#include <Application.h>
|
||||
+
|
||||
+
|
||||
+#include <vlc_common.h>
|
||||
+extern "C"
|
||||
+{
|
||||
+#include "../libvlc.h"
|
||||
+#include <pthread.h>
|
||||
+
|
||||
+
|
||||
+static void set_libvlc_path (void)
|
||||
+{
|
||||
+ psz_vlcpath = (char *)PKGLIBDIR;
|
||||
+}
|
||||
+
|
||||
+void system_Init (void)
|
||||
+{
|
||||
+ BApplication app("application/x-vnd.videolan");
|
||||
+ pthread_once_t once = PTHREAD_ONCE_INIT;
|
||||
+
|
||||
+ pthread_once (&once, set_libvlc_path);
|
||||
+}
|
||||
+
|
||||
+void system_Configure (libvlc_int_t *libvlc,
|
||||
+ int argc, const char *const argv[])
|
||||
+{
|
||||
+ (void)libvlc; (void)argc; (void)argv;
|
||||
+}
|
||||
+
|
||||
+void system_End (void)
|
||||
+{
|
||||
+}
|
||||
+}
|
||||
--- vlc-2.0.3-orig/src/Makefile.am 2012-05-15 12:41:19.024641536 +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)
|
||||
else
|
||||
+if HAVE_HAIKU
|
||||
+libvlccore_la_SOURCES += $(SOURCES_libvlc_haiku)
|
||||
+else
|
||||
libvlccore_la_SOURCES += $(SOURCES_libvlc_other)
|
||||
endif
|
||||
endif
|
||||
@@ -228,6 +231,7 @@
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
+endif
|
||||
if BUILD_HTTPD
|
||||
libvlccore_la_SOURCES += $(SOURCES_libvlc_httpd)
|
||||
endif
|
||||
@@ -287,6 +291,16 @@
|
||||
os2/specific.c \
|
||||
$(NULL)
|
||||
|
||||
+SOURCES_libvlc_haiku = \
|
||||
+ posix/dirs.c \
|
||||
+ misc/atomic.c \
|
||||
+ posix/filesystem.c \
|
||||
+ network/poll.c \
|
||||
+ posix/thread.c \
|
||||
+ posix/plugin.c \
|
||||
+ haiku/specific.cpp \
|
||||
+ $(NULL)
|
||||
+
|
||||
SOURCES_libvlc_other = \
|
||||
posix/dirs.c \
|
||||
misc/atomic.c \
|
||||
|
||||
--- vlc-2.0.3-orig/modules/gui/qt4/qt4.cpp 2012-07-02 00:47:23.031457280 +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;
|
||||
|
||||
-#elif defined (Q_WS_MAC)
|
||||
+#elif defined (Q_WS_MAC) || defined(Q_WS_HAIKU)
|
||||
p_wnd->handle.nsobject = (void *)p_mi->getVideo( &i_x, &i_y, &i_width, &i_height );
|
||||
if( !p_wnd->handle.nsobject )
|
||||
return VLC_EGENERIC;
|
||||
|
||||
--- vlc-2.0.3-orig/src/network/io.c 2012-04-27 17:14:57.020709376 +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)
|
||||
{
|
||||
case SOCK_STREAM:
|
||||
+#ifdef SOCK_RDM
|
||||
case SOCK_RDM:
|
||||
+#endif
|
||||
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
|
||||
@@ -176,10 +176,10 @@ index a7d06cc..22348ae 100644
|
||||
+ posix/error.c \
|
||||
+ posix/filesystem.c \
|
||||
+ posix/netconf.c \
|
||||
+ posix/thread.c \
|
||||
+ posix/timer.c \
|
||||
+ posix/plugin.c \
|
||||
+ posix/rand.c \
|
||||
+ posix/thread.c \
|
||||
+ posix/timer.c \
|
||||
+ haiku/specific.cpp \
|
||||
+ $(NULL)
|
||||
+
|
||||
@@ -517,3 +517,116 @@ index 0000000..3768ba5
|
||||
+{
|
||||
+}
|
||||
+}
|
||||
diff --git a/modules/video_output/caca.c b/modules/video_output/caca.c
|
||||
index 75c83e6..8922732 100644
|
||||
--- a/modules/video_output/caca.c
|
||||
+++ b/modules/video_output/caca.c
|
||||
@@ -34,7 +34,7 @@
|
||||
#include <vlc_plugin.h>
|
||||
#include <vlc_vout_display.h>
|
||||
#include <vlc_picture_pool.h>
|
||||
-#if !defined(_WIN32) && !defined(__APPLE__)
|
||||
+#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__HAIKU__)
|
||||
# ifdef X_DISPLAY_MISSING
|
||||
# error Xlib required due to XInitThreads
|
||||
# endif
|
||||
diff --git a/modules/video_output/sdl.c b/modules/video_output/sdl.c
|
||||
index e56c976..76b7ef4 100644
|
||||
--- a/modules/video_output/sdl.c
|
||||
+++ b/modules/video_output/sdl.c
|
||||
@@ -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 @@ static int Open(vlc_object_t *object)
|
||||
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
|
||||
diff --git a/modules/audio_output/Makefile.am b/modules/audio_output/Makefile.am
|
||||
index 1e6a233..ba072a4 100644
|
||||
--- a/modules/audio_output/Makefile.am
|
||||
+++ b/modules/audio_output/Makefile.am
|
||||
@@ -91,6 +91,12 @@ if HAVE_SNDIO
|
||||
aout_LTLIBRARIES += libsndio_plugin.la
|
||||
endif
|
||||
|
||||
+libhaiku_aout_plugin_la_SOURCES = audio_output/haiku.cpp
|
||||
+libhaiku_aout_plugin_la_LIBADD = -lmedia
|
||||
+#if HAVE_HAIKU
|
||||
+#aout_LTLIBRARIES += libhaiku_aout_plugin.la
|
||||
+#endif
|
||||
+
|
||||
libwaveout_plugin_la_SOURCES = audio_output/waveout.c \
|
||||
audio_output/windows_audio_common.h
|
||||
libwaveout_plugin_la_LIBADD = -lwinmm
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 121e8c9..6fe659e 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -864,7 +864,7 @@ dnl
|
||||
dnl Compiler warnings
|
||||
dnl
|
||||
|
||||
-RDC_PROG_CC_WFLAGS([all extra sign-compare undef pointer-arith bad-function-cast write-strings missing-prototypes volatile-register-var error-implicit-function-declaration])
|
||||
+RDC_PROG_CC_WFLAGS([all extra sign-compare undef pointer-arith bad-function-cast write-strings missing-prototypes volatile-register-var])
|
||||
RDC_PROG_CC_FLAGS([-pipe])
|
||||
AC_LANG_PUSH([C++])
|
||||
RDC_PROG_CXX_WFLAGS([all extra sign-compare undef pointer-arith volatile-register-var])
|
||||
@@ -2532,7 +2532,7 @@ then
|
||||
VLC_SAVE_FLAGS
|
||||
CPPFLAGS="${CPPFLAGS} ${POSTPROC_CFLAGS}"
|
||||
CFLAGS="${CFLAGS} ${POSTPROC_CFLAGS}"
|
||||
- AC_CHECK_HEADERS(postproc/postprocess.h)
|
||||
+ AC_CHECK_HEADERS(libpostproc/postprocess.h)
|
||||
VLC_ADD_PLUGIN([postproc])
|
||||
VLC_ADD_LIBS([postproc],[$POSTPROC_LIBS $AVUTIL_LIBS])
|
||||
VLC_ADD_CFLAGS([postproc],[$POSTPROC_CFLAGS $AVUTIL_CFLAGS])
|
||||
diff --git a/modules/gui/qt4/Makefile.am b/modules/gui/qt4/Makefile.am
|
||||
index 1a564cf..4d12501 100644
|
||||
--- a/modules/gui/qt4/Makefile.am
|
||||
+++ b/modules/gui/qt4/Makefile.am
|
||||
@@ -22,7 +22,7 @@ else
|
||||
if HAVE_WIN32
|
||||
libqt4_plugin_la_LIBADD += -lole32 -lcomctl32 -luuid
|
||||
else
|
||||
-libqt4_plugin_la_LIBADD += $(X_LIBS) $(X_PRE_LIB) -lX11
|
||||
+libqt4_plugin_la_LIBADD += $(X_LIBS) $(X_PRE_LIB)
|
||||
endif
|
||||
endif
|
||||
if HAVE_DARWIN
|
||||
diff --git a/modules/video_output/Makefile.in b/modules/video_output/Makefile.in
|
||||
index ba02f97..e9b7b36 100644
|
||||
--- a/modules/video_output/Makefile.in
|
||||
+++ b/modules/video_output/Makefile.in
|
||||
@@ -123,7 +123,7 @@ host_triplet = @host@
|
||||
@HAVE_KVA_TRUE@am__append_19 = libkva_plugin.la
|
||||
@HAVE_ANDROID_TRUE@am__append_20 = libandroid_native_window_plugin.la
|
||||
@HAVE_ANDROID_TRUE@@HAVE_EGL_TRUE@am__append_21 = libegl_android_plugin.la
|
||||
-@HAVE_DARWIN_FALSE@@HAVE_WIN32_FALSE@am__append_22 = $(X_LIBS) $(X_PRE_LIBS) -lX11
|
||||
+@HAVE_DARWIN_FALSE@@HAVE_WIN32_FALSE@am__append_22 = $(X_LIBS) $(X_PRE_LIBS) -lX112
|
||||
subdir = modules/video_output
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = $(top_srcdir)/m4/dolt.m4 \
|
||||
diff --git a/modules/video_output/Modules.am b/modules/video_output/Modules.am
|
||||
index df8fbf6..012d93b 100644
|
||||
--- a/modules/video_output/Modules.am
|
||||
+++ b/modules/video_output/Modules.am
|
||||
@@ -228,7 +228,7 @@ libcaca_plugin_la_CFLAGS = $(AM_CFLAGS) $(CACA_CFLAGS)
|
||||
libcaca_plugin_la_LIBADD = $(CACA_LIBS)
|
||||
if !HAVE_WIN32
|
||||
if !HAVE_DARWIN
|
||||
-libcaca_plugin_la_LIBADD += $(X_LIBS) $(X_PRE_LIBS) -lX11
|
||||
+libcaca_plugin_la_LIBADD += $(X_LIBS) $(X_PRE_LIBS)
|
||||
endif
|
||||
endif
|
||||
libcaca_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
|
||||
|
||||
@@ -26,30 +26,6 @@ PROVIDES="
|
||||
lib:libvlc$secondaryArchSuffix
|
||||
lib:libvlccore$secondaryArchSuffix
|
||||
"
|
||||
DEPEND="
|
||||
faad2
|
||||
libdca
|
||||
libdvdnav
|
||||
libmatroska
|
||||
libmad
|
||||
a52dec
|
||||
schroedinger
|
||||
twolame
|
||||
lua
|
||||
taglib
|
||||
libbluray
|
||||
lame
|
||||
libgcrypt
|
||||
libcddb
|
||||
x264
|
||||
flac
|
||||
ffmpeg
|
||||
libsdl
|
||||
sdl-image
|
||||
xproto
|
||||
libxau
|
||||
libxcb
|
||||
"
|
||||
REQUIRES="
|
||||
haiku${secondaryArchSuffix}
|
||||
libqt4${secondaryArchSuffix} >= 4.8
|
||||
@@ -72,30 +48,76 @@ BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
libqt4${secondaryArchSuffix}_devel >= 4.8
|
||||
devel:liba52$secondaryArchSuffix
|
||||
devel:libass$secondaryArchSuffix
|
||||
devel:libbluray$secondaryArchSuffix
|
||||
devel:libcaca$secondaryArchSuffix
|
||||
devel:libcddb$secondaryArchSuffix
|
||||
devel:libdca$secondaryArchSuffix
|
||||
devel:libdvbpsi$secondaryArchSuffix
|
||||
devel:libdvdcss$secondaryArchSuffix
|
||||
devel:libdvdnav$secondaryArchSuffix
|
||||
devel:libdvdread$secondaryArchSuffix
|
||||
devel:libebml$secondaryArchSuffix
|
||||
devel:libenca$secondaryArchSuffix
|
||||
devel:libfaad$secondaryArchSuffix
|
||||
devel:libflac$secondaryArchSuffix
|
||||
# devel:libfluidsynth$secondaryArchSuffix
|
||||
devel:libfontconfig$secondaryArchSuffix
|
||||
devel:libfreetype$secondaryArchSuffix
|
||||
devel:libfribidi$secondaryArchSuffix
|
||||
devel:libgcrypt$secondaryArchSuffix
|
||||
devel:libgl$secondaryArchSuffix
|
||||
# devel:libgnutls$secondaryArchSuffix
|
||||
devel:libgpg_error$secondaryArchSuffix
|
||||
devel:libharfbuzz$secondaryArchSuffix
|
||||
devel:libiconv$secondaryArchSuffix
|
||||
devel:libjpeg$secondaryArchSuffix
|
||||
devel:libmad$secondaryArchSuffix
|
||||
# devel:libpthread_stubs$secondaryArchSuffix
|
||||
devel:libmatroska$secondaryArchSuffix
|
||||
devel:libmodplug$secondaryArchSuffix
|
||||
devel:libmpcdec$secondaryArchSuffix
|
||||
devel:libmpeg2$secondaryArchSuffix
|
||||
# devel:libmtp$secondaryArchSuffix
|
||||
devel:libogg$secondaryArchSuffix
|
||||
devel:libopus$secondaryArchSuffix
|
||||
devel:libpng$secondaryArchSuffix
|
||||
devel:libpthread_stubs$secondaryArchSuffix
|
||||
devel:libsamplerate$secondaryArchSuffix
|
||||
# devel:libschroedinger$secondaryArchSuffix
|
||||
devel:libsdl_1.2$secondaryArchSuffix
|
||||
devel:libsdl_image_1.2$secondaryArchSuffix
|
||||
# devel:libsmbclient$secondaryArchSuffix
|
||||
devel:libspeex$secondaryArchSuffix
|
||||
devel:libssh2$secondaryArchSuffix
|
||||
devel:libssl$secondaryArchSuffix
|
||||
devel:libswscale$secondaryArchSuffix
|
||||
# devel:libxcb$secondaryArchSuffix
|
||||
devel:libtag$secondaryArchSuffix
|
||||
devel:libtheora$secondaryArchSuffix
|
||||
devel:libtwolame$secondaryArchSuffix
|
||||
devel:libupnp$secondaryArchSuffix
|
||||
devel:libvorbis$secondaryArchSuffix
|
||||
devel:libvpx$secondaryArchSuffix
|
||||
devel:libx264$secondaryArchSuffix
|
||||
devel:libx265$secondaryArchSuffix
|
||||
devel:libxcb$secondaryArchSuffix
|
||||
devel:libxml2$secondaryArchSuffix
|
||||
devel:libz$secondaryArchSuffix
|
||||
"
|
||||
PATCH()
|
||||
{
|
||||
sed -i 's/-lX11//g' modules/gui/qt4/Makefile.am
|
||||
}
|
||||
|
||||
PATCHES="vlc-2.2.1.patch"
|
||||
|
||||
BUILD()
|
||||
{
|
||||
bootstrap
|
||||
runConfigure ./configure --disable-rpath --disable-lua \
|
||||
--disable-avcodec --disable-xcb --enable-run-as-root
|
||||
# --bindir=$appsDir/VLC --libdir=$appsDir/VLC/lib
|
||||
sed -i 's/-Werror-implicit-function-declaration//g' src/Makefile
|
||||
runConfigure ./configure --disable-rpath --disable-lua --disable-xcb \
|
||||
--with-default-font=/system/data/fonts/ttfonts/DejaVuSans.ttf \
|
||||
--with-default-font-family=Sans \
|
||||
--with-default-monospace-font-family=Monospace --disable-update-check \
|
||||
--disable-dependency-tracking --enable-run-as-root
|
||||
#--bindir=$appsDir/VLC --libdir=$appsDir/VLC/lib
|
||||
|
||||
make $jobArgs
|
||||
true
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
@@ -103,9 +125,15 @@ INSTALL()
|
||||
make install
|
||||
|
||||
rm -rf $dataDir/{applications,icons,kde4,vlc}
|
||||
|
||||
# Punt useless libtool's .la files
|
||||
find $libDir -name '*.la' -delete
|
||||
|
||||
addResourcesToBinaries $portDir/additional-files/vlc.rdef $binDir/vlc
|
||||
addAppDeskbarSymlink $binDir/vlc "VLC media player"
|
||||
|
||||
# prepareInstalledDevelLibs libvlc libvlccore
|
||||
|
||||
# packageEntries devel \
|
||||
# $developDir
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user