diff --git a/media-video/vlc/patches/vlc-0.8.6i.patchset b/media-video/vlc/patches/vlc-0.8.6i.patchset index 5b7b11120..a17fa23d5 100644 --- a/media-video/vlc/patches/vlc-0.8.6i.patchset +++ b/media-video/vlc/patches/vlc-0.8.6i.patchset @@ -1,4 +1,4 @@ -From c7030246c56c8648e76e2e261a5d65fa5254b008 Mon Sep 17 00:00:00 2001 +From 06f68b888f98031031f7b230be58bdb1cd57674d Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Wed, 3 Sep 2014 22:18:59 +0200 Subject: applying patch vlc-0.8.6i.patch @@ -358,7 +358,7 @@ index ecd1a01..98b9b16 100644 1.8.3.4 -From 3cf38a1356818371f0612deee0c326148843f744 Mon Sep 17 00:00:00 2001 +From 9c98e262f8bd27c3d435d3df476158d89ce8039c Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Thu, 4 Sep 2014 22:36:37 +0200 Subject: FFmpeg 0.10 fix. @@ -389,7 +389,7 @@ index ad7cfc3..7eba486 100644 1.8.3.4 -From fe30c5c71454db22abaf29329f44933cceaf1d7e Mon Sep 17 00:00:00 2001 +From 011b0e13bf81d7998f49d14dae9c50087b8b4f34 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Thu, 4 Sep 2014 22:37:02 +0200 Subject: ffmpeg 0.10 fixes. @@ -584,7 +584,7 @@ index 2eff2ba..fd9dc18 100644 1.8.3.4 -From 692745b803ffb8ebcfb88c2dc8a662a390f930cd Mon Sep 17 00:00:00 2001 +From 23f6a0e6797dfef12d6738e64896ad0c387c113e Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Thu, 4 Sep 2014 23:00:02 +0200 Subject: Cinepak: gcc2 fixes. @@ -624,7 +624,7 @@ index b30ea78..c8fe9d1 100644 1.8.3.4 -From 32b65ad382ecce1f5980dfb3e2cd0ba19644e8aa Mon Sep 17 00:00:00 2001 +From dfb360ba93d7892b8cd287e42d496fb46f0490b9 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Thu, 11 Sep 2014 08:39:13 +0200 Subject: gcc2, BeOS vs Haiku and ffmpeg 0.10 fixes. @@ -63438,3 +63438,183 @@ index f5c3a07..8d6cb19 100644 -- 1.8.3.4 + +From e7ba659ee100d858df92f2a4cbecbcbcd4a54321 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Mon, 15 Sep 2014 21:24:33 +0200 +Subject: Fix build with modern libpng. + +* Patch suggested by Diver. + +diff --git a/modules/codec/png.c b/modules/codec/png.c +index 21aa111..5284dda 100644 +--- a/modules/codec/png.c ++++ b/modules/codec/png.c +@@ -147,7 +147,7 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) + p_info = png_create_info_struct( p_png ); + if( p_info == NULL ) + { +- png_destroy_read_struct( &p_png, png_infopp_NULL, png_infopp_NULL ); ++ png_destroy_read_struct( &p_png, (png_infopp)NULL, (png_infopp)NULL ); + block_Release( p_block ); *pp_block = NULL; + return NULL; + } +@@ -155,7 +155,7 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) + p_end_info = png_create_info_struct( p_png ); + if( p_end_info == NULL ) + { +- png_destroy_read_struct( &p_png, &p_info, png_infopp_NULL ); ++ png_destroy_read_struct( &p_png, &p_info, (png_infopp)NULL ); + block_Release( p_block ); *pp_block = NULL; + return NULL; + } +-- +1.8.3.4 + + +From a6f0d1d8d1a8bdd737073e6fe859fb4d45886414 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Mon, 15 Sep 2014 21:45:27 +0200 +Subject: Fix build with modern Matroska + +* Patch suggested by Diver +* Code can safely be removed: it's only debug messages. + +diff --git a/modules/demux/mkv.cpp b/modules/demux/mkv.cpp +index d3ae27f..9271f57 100644 +--- a/modules/demux/mkv.cpp ++++ b/modules/demux/mkv.cpp +@@ -75,7 +75,6 @@ + #include "matroska/KaxSegment.h" + #include "matroska/KaxTag.h" + #include "matroska/KaxTags.h" +-#include "matroska/KaxTagMulti.h" + #include "matroska/KaxTracks.h" + #include "matroska/KaxTrackAudio.h" + #include "matroska/KaxTrackVideo.h" +@@ -3871,74 +3870,6 @@ void matroska_segment_c::LoadTags( ) + } + ep->Up(); + } +- else if( MKV_IS_ID( el, KaxTagGeneral ) ) +- { +- msg_Dbg( &sys.demuxer, "| + General" ); +- ep->Down(); +- while( ( el = ep->Get() ) != NULL ) +- { +- msg_Dbg( &sys.demuxer, "| | + Unknown (%s)", typeid( *el ).name() ); +- } +- ep->Up(); +- } +- else if( MKV_IS_ID( el, KaxTagGenres ) ) +- { +- msg_Dbg( &sys.demuxer, "| + Genres" ); +- ep->Down(); +- while( ( el = ep->Get() ) != NULL ) +- { +- msg_Dbg( &sys.demuxer, "| | + Unknown (%s)", typeid( *el ).name() ); +- } +- ep->Up(); +- } +- else if( MKV_IS_ID( el, KaxTagAudioSpecific ) ) +- { +- msg_Dbg( &sys.demuxer, "| + Audio Specific" ); +- ep->Down(); +- while( ( el = ep->Get() ) != NULL ) +- { +- msg_Dbg( &sys.demuxer, "| | + Unknown (%s)", typeid( *el ).name() ); +- } +- ep->Up(); +- } +- else if( MKV_IS_ID( el, KaxTagImageSpecific ) ) +- { +- msg_Dbg( &sys.demuxer, "| + Images Specific" ); +- ep->Down(); +- while( ( el = ep->Get() ) != NULL ) +- { +- msg_Dbg( &sys.demuxer, "| | + Unknown (%s)", typeid( *el ).name() ); +- } +- ep->Up(); +- } +- else if( MKV_IS_ID( el, KaxTagMultiComment ) ) +- { +- msg_Dbg( &sys.demuxer, "| + Multi Comment" ); +- } +- else if( MKV_IS_ID( el, KaxTagMultiCommercial ) ) +- { +- msg_Dbg( &sys.demuxer, "| + Multi Commercial" ); +- } +- else if( MKV_IS_ID( el, KaxTagMultiDate ) ) +- { +- msg_Dbg( &sys.demuxer, "| + Multi Date" ); +- } +- else if( MKV_IS_ID( el, KaxTagMultiEntity ) ) +- { +- msg_Dbg( &sys.demuxer, "| + Multi Entity" ); +- } +- else if( MKV_IS_ID( el, KaxTagMultiIdentifier ) ) +- { +- msg_Dbg( &sys.demuxer, "| + Multi Identifier" ); +- } +- else if( MKV_IS_ID( el, KaxTagMultiLegal ) ) +- { +- msg_Dbg( &sys.demuxer, "| + Multi Legal" ); +- } +- else if( MKV_IS_ID( el, KaxTagMultiTitle ) ) +- { +- msg_Dbg( &sys.demuxer, "| + Multi Title" ); +- } + else + { + msg_Dbg( &sys.demuxer, "| + Unknown (%s)", typeid( *el ).name() ); +-- +1.8.3.4 + + +From dfb124905d77c7737b4bf29fa2b95191088b9dde Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Mon, 15 Sep 2014 22:01:42 +0200 +Subject: gcc2 fix. + + +diff --git a/modules/video_output/opengl.c b/modules/video_output/opengl.c +index 3a8def1..1745819 100644 +--- a/modules/video_output/opengl.c ++++ b/modules/video_output/opengl.c +@@ -525,6 +525,7 @@ static int Init( vout_thread_t *p_vout ) + #ifdef OPENGL_MORE_EFFECT + else + { ++ float f_pov_x, f_pov_y, f_pov_z; + /* Set the perpective */ + glMatrixMode( GL_PROJECTION ); + glLoadIdentity(); +@@ -533,7 +534,6 @@ static int Init( vout_thread_t *p_vout ) + glLoadIdentity(); + glTranslatef( 0.0, 0.0, -3.0 ); + +- float f_pov_x, f_pov_y, f_pov_z; + f_pov_x = var_CreateGetFloat( p_vout, "opengl-pov-x"); + f_pov_y = var_CreateGetFloat( p_vout, "opengl-pov-y"); + f_pov_z = var_CreateGetFloat( p_vout, "opengl-pov-z"); +@@ -950,14 +950,14 @@ static void DisplayVideo( vout_thread_t *p_vout, picture_t *p_pic ) + glBegin(GL_QUADS); + for (i_i = 0; i_i < p_vout->fmt_out.i_visible_width; i_i += i_n_x) + { ++ int i_m; ++ int i_index_max = 0; ++ + if ( i_i == i_n_x * i_n / 2) i_n_x += p_vout->fmt_out.i_visible_width % i_n; + if ((i_i == (p_vout->fmt_out.i_visible_width / i_n) * i_n / 2 + i_n_x) && + (p_vout->fmt_out.i_visible_width / i_n != i_n_x)) + i_n_x -= p_vout->fmt_out.i_visible_width % i_n; + +- int i_m; +- int i_index_max = 0; +- + for (i_j = 0; i_j < p_vout->fmt_out.i_visible_height; i_j += i_n_y) + { + if ( i_j == i_n_y * i_n / 2) i_n_y += p_vout->fmt_out.i_visible_height % i_n; +-- +1.8.3.4 + diff --git a/media-video/vlc/vlc-0.8.6i.recipe b/media-video/vlc/vlc-0.8.6i.recipe index b257a23cc..11d636883 100644 --- a/media-video/vlc/vlc-0.8.6i.recipe +++ b/media-video/vlc/vlc-0.8.6i.recipe @@ -26,6 +26,14 @@ REQUIRES=" PROVIDES_devel=" vlc_devel = $portVersion devel:libvlc + devel:libbeos + devel:libi420_rgb_mmx + devel:libi420_ymga_mmx + devel:libi420_yuy2_mmx + devel:libi422_yuy2_mmx + devel:libmemcpy3dn + devel:libmemcpymmx + devel:libmemcpymmxext " REQUIRES_devel=" @@ -33,18 +41,51 @@ REQUIRES_devel=" " BUILD_REQUIRES=" + devel:liba52$secondaryArchSuffix + devel:libid3tag$secondaryArchSuffix + devel:libmpeg2$secondaryArchSuffix + devel:libmodplug$secondaryArchSuffix + devel:libdvdcss$secondaryArchSuffix + devel:libdvdnav$secondaryArchSuffix + devel:libdvdread$secondaryArchSuffix + devel:libfreetype$secondaryArchSuffix + devel:libsmbclient$secondaryArchSuffix + devel:libpng$secondaryArchSuffix + devel:libdvbpsi$secondaryArchSuffix + devel:libvorbis$secondaryArchSuffix + devel:libxml2$secondaryArchSuffix + devel:libbz2$secondaryArchSuffix + devel:libebml$secondaryArchSuffix + devel:libcdio$secondaryArchSuffix + devel:libmatroska$secondaryArchSuffix + devel:libfaad$secondaryArchSuffix + devel:libdca$secondaryArchSuffix + devel:libfaac$secondaryArchSuffix + devel:libflac$secondaryArchSuffix + devel:libfribidi$secondaryArchSuffix + devel:libgl$secondaryArchSuffix + devel:libglu$secondaryArchSuffix + devel:libgnutls$secondaryArchSuffix + devel:libjpeg$secondaryArchSuffix + devel:libmp3lame$secondaryArchSuffix + devel:libmpcdec$secondaryArchSuffix + devel:libspeex$secondaryArchSuffix + devel:libtheora$secondaryArchSuffix + devel:libtwolame$secondaryArchSuffix + devel:libvcdinfo$secondaryArchSuffix + devel:libavcodec$secondaryArchSuffix == 53.61.100 devel:libcddb$secondaryArchSuffix - devel:libdvdread$secondaryArchSuffix devel:libiconv$secondaryArchSuffix devel:libintl$secondaryArchSuffix devel:libmad$secondaryArchSuffix - devel:libmodplug$secondaryArchSuffix - devel:libmpeg2$secondaryArchSuffix devel:libogg$secondaryArchSuffix devel:libpostproc$secondaryArchSuffix devel:libz$secondaryArchSuffix + " +# We need a recipe for an old version of this that will still build with gcc2. +# devel:libx264$secondaryArchSuffix BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel >= $haikuVersion @@ -69,7 +110,8 @@ BUILD() { autoconf runConfigure ./configure CFLAGS="-Davcodec_init=avcodec_register_all" \ - --disable-wxwidgets --disable-skins2 --enable-shared + --disable-wxwidgets --disable-skins2 --enable-shared \ + --enable-screen --enable-dvdread --enable-smb --enable-faad make # Multi-job build is not working } @@ -77,7 +119,9 @@ INSTALL() { make install - prepareInstalledDevelLib libvlc + prepareInstalledDevelLibs libvlc vlc/libbeos vlc/libi420_rgb_mmx \ + vlc/libi420_ymga_mmx vlc/libi420_yuy2_mmx vlc/libi422_yuy2_mmx \ + vlc/libmemcpy3dn vlc/libmemcpymmx vlc/libmemcpymmxext packageEntries devel $developDir }