[Frugalware-darcs] frugalware-current: vlc-0.8.6-6-x86_64

VMiklos vmiklos at frugalware.org
Thu Jun 21 20:43:15 CEST 2007


Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070621184110-e2957-ec599179a16af19bba5cfed4ddb06e6b431f8c5e.gz;

[vlc-0.8.6-6-x86_64
VMiklos <vmiklos at frugalware.org>**20070621184110
 version bump
 fixed font path for xorg7
 removed no longer necessary -flac113.diff
 drop no longer needed autotools hack
] {
hunk ./source/xmultimedia-extra/vlc/FrugalBuild 6
-pkgextraver=b
-pkgrel=5
+pkgextraver=c
+pkgrel=6
hunk ./source/xmultimedia-extra/vlc/FrugalBuild 21
-	$pkgname-ffmpeg.diff $pkgname.desktop vlc-0.8.5-libintl.diff vlc-0.8.6-flac113.diff libdca.patch)
+	$pkgname-ffmpeg.diff $pkgname.desktop vlc-0.8.5-libintl.diff libdca.patch)
+sha1sums=('aefaf7a039874930b3e7caf139d2ed5b5bbd0a56'\
+          '888a02c9f81331fce1f6ee5f705ce68e5b486ffd'\
+          '0c58c35fe47c4d14cd4d4c8c505863dbfc93f5e0'\
+          '50bfbc12fc0ad94178b2e08df22a0b26da36c1d5'\
+          'edc3a14dfd9b022dca7593e006c324fa5cc17e48')
+
hunk ./source/xmultimedia-extra/vlc/FrugalBuild 35
-		'/usr/X11R6/lib/X11/fonts/TTF/VeraBd.ttf' \
+		'/usr/lib/X11/fonts/TTF/VeraBd.ttf' \
hunk ./source/xmultimedia-extra/vlc/FrugalBuild 37
-	for i in aclocal automake
-	do
-		Fsed "=$i" "=$i-" ./bootstrap
-	done
hunk ./source/xmultimedia-extra/vlc/FrugalBuild 74
-sha1sums=('2e67f073009de766340f1ef9f3920c2b4efa327e'\
-          '888a02c9f81331fce1f6ee5f705ce68e5b486ffd'\
-          '0c58c35fe47c4d14cd4d4c8c505863dbfc93f5e0'\
-          '50bfbc12fc0ad94178b2e08df22a0b26da36c1d5'\
-          '801e115ebe29904b668201e23a783a6289dad8e6'\
-          'edc3a14dfd9b022dca7593e006c324fa5cc17e48')
hunk ./source/xmultimedia-extra/vlc/FrugalBuild 76
-
-
hunk ./source/xmultimedia-extra/vlc/vlc-0.8.6-flac113.diff 1
---- vlc-0.8.6-clean/modules/codec/flac.c	2006-12-09 01:12:20.000000000 +0000
-+++ vlc-0.8.6/modules/codec/flac.c	2006-12-24 01:34:54.000000000 +0000
-@@ -40,6 +40,10 @@
- 
- #define MAX_FLAC_HEADER_SIZE 16
- 
-+#if defined(FLAC_API_VERSION_CURRENT) && FLAC_API_VERSION_CURRENT >= 8
-+#   define USE_NEW_FLAC_API
-+#endif
-+
- /*****************************************************************************
-  * decoder_sys_t : FLAC decoder descriptor
-  *****************************************************************************/
-@@ -225,6 +229,25 @@
-         return VLC_EGENERIC;
-     }
- 
-+#ifdef USE_NEW_FLAC_API
-+    if( FLAC__stream_decoder_init_stream( p_sys->p_flac,
-+                                          DecoderReadCallback,
-+                                          NULL,
-+                                          NULL,
-+                                          NULL,
-+                                          NULL,
-+                                          DecoderWriteCallback,
-+                                          DecoderMetadataCallback,
-+                                          DecoderErrorCallback,
-+                                          p_dec )
-+        != FLAC__STREAM_DECODER_INIT_STATUS_OK )
-+    {
-+        msg_Err( p_dec, "FLAC__stream_decoder_init_stream() failed" );
-+        FLAC__stream_decoder_delete( p_sys->p_flac );
-+        free( p_sys );
-+        return VLC_EGENERIC;
-+    }
-+#else
-     FLAC__stream_decoder_set_read_callback( p_sys->p_flac,
-                                             DecoderReadCallback );
-     FLAC__stream_decoder_set_write_callback( p_sys->p_flac,
-@@ -237,6 +260,7 @@
- 
-     FLAC__stream_decoder_init( p_sys->p_flac );
- #endif
-+#endif
- 
-     /* Set output properties */
-     p_dec->fmt_out.i_cat = AUDIO_ES;
-@@ -730,16 +754,27 @@
-     case FLAC__STREAM_DECODER_END_OF_STREAM:
-         msg_Dbg( p_dec, "the decoder has reached the end of the stream." );
-         break;
-+#ifdef USE_NEW_FLAC_API
-+    case FLAC__STREAM_DECODER_OGG_ERROR:
-+        msg_Err( p_dec, "error occurred in the Ogg layer." );
-+        break;
-+    case FLAC__STREAM_DECODER_SEEK_ERROR:
-+        msg_Err( p_dec, "error occurred while seeking." );
-+        break;
-+#endif
-     case FLAC__STREAM_DECODER_ABORTED:
-         msg_Warn( p_dec, "the decoder was aborted by the read callback." );
-         break;
-+#ifndef USE_NEW_FLAC_API
-     case FLAC__STREAM_DECODER_UNPARSEABLE_STREAM:
-         msg_Warn( p_dec, "the decoder encountered reserved fields in use "
-                  "in the stream." );
-         break;
-+#endif
-     case FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR:
-         msg_Err( p_dec, "error when allocating memory." );
-         break;
-+#ifndef USE_NEW_FLAC_API
-     case FLAC__STREAM_DECODER_ALREADY_INITIALIZED:
-         msg_Err( p_dec, "FLAC__stream_decoder_init() was called when the "
-                  "decoder was already initialized, usually because "
-@@ -749,6 +784,7 @@
-         msg_Err( p_dec, "FLAC__stream_decoder_init() was called without "
-                  "all callbacks being set." );
-         break;
-+#endif
-     case FLAC__STREAM_DECODER_UNINITIALIZED:
-         msg_Err( p_dec, "decoder in uninitialized state." );
-         break;
-@@ -1183,7 +1219,12 @@
-     p_sys->i_samples_delay = 0;
- 
-     /* Create flac encoder */
--    p_sys->p_flac = FLAC__stream_encoder_new();
-+    if( !(p_sys->p_flac = FLAC__stream_encoder_new()) )
-+    {
-+        msg_Err( p_enc, "FLAC__stream_encoder_new() failed" );
-+        free( p_sys );
-+        return VLC_EGENERIC;
-+    }
- 
-     FLAC__stream_encoder_set_streamable_subset( p_sys->p_flac, 1 );
-     FLAC__stream_encoder_set_channels( p_sys->p_flac,
-@@ -1193,15 +1234,32 @@
-     FLAC__stream_encoder_set_bits_per_sample( p_sys->p_flac, 16 );
-     p_enc->fmt_in.i_codec = AOUT_FMT_S16_NE;
- 
-+    /* Get and store the STREAMINFO metadata block as a p_extra */
-+    p_sys->p_chain = 0;
-+
-+#ifdef USE_NEW_FLAC_API
-+    if( FLAC__stream_encoder_init_stream( p_sys->p_flac,
-+                                          EncoderWriteCallback,
-+                                          NULL,
-+                                          NULL,
-+                                          EncoderMetadataCallback,
-+                                          p_enc )
-+        != FLAC__STREAM_ENCODER_INIT_STATUS_OK )
-+    {
-+        msg_Err( p_enc, "FLAC__stream_encoder_init_stream() failed" );
-+        FLAC__stream_encoder_delete( p_sys->p_flac );
-+        free( p_sys );
-+        return VLC_EGENERIC;
-+    }
-+#else
-     FLAC__stream_encoder_set_write_callback( p_sys->p_flac,
-         EncoderWriteCallback );
-     FLAC__stream_encoder_set_metadata_callback( p_sys->p_flac,
-         EncoderMetadataCallback );
-     FLAC__stream_encoder_set_client_data( p_sys->p_flac, p_enc );
- 
--    /* Get and store the STREAMINFO metadata block as a p_extra */
--    p_sys->p_chain = 0;
-     FLAC__stream_encoder_init( p_sys->p_flac );
-+#endif
- 
-     return VLC_SUCCESS;
- }
rmfile ./source/xmultimedia-extra/vlc/vlc-0.8.6-flac113.diff
}


More information about the Frugalware-darcs mailing list