Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=aaeb3d6de23ce8a9a1340d7043b2c95b368608dc
commit aaeb3d6de23ce8a9a1340d7043b2c95b368608dc
Author: crazy <cr...@frugalware.org>
Date: Mon Jul 5 00:02:34 2010 +0200
vlc-1.1.0-1-x86_64
* Version bump
* some cleanup
diff --git
a/source/xmultimedia-extra/vlc/0001-Fixed-potential-stack-overflow-in-avi-demuxer.patch
b/source/xmultimedia-extra/vlc/0001-Fixed-potential-stack-overflow-in-avi-demuxer.patch
deleted file mode 100644
index 220e814..0000000
---
a/source/xmultimedia-extra/vlc/0001-Fixed-potential-stack-overflow-in-avi-demuxer.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 861e374d03e6c60c7d3c98428c632fe3b9e371b2 Mon Sep 17 00:00:00 2001
-From: Laurent Aimar <fen...@videolan.org>
-Date: Tue, 15 Sep 2009 21:02:40 +0200
-Subject: [PATCH] Fixed potential stack overflow in avi demuxer.
-
-Reported by Sebastian Apelt, Siberas.
----
- modules/demux/avi/libavi.c | 13 ++++++++-----
- 1 files changed, 8 insertions(+), 5 deletions(-)
-
-diff --git a/modules/demux/avi/libavi.c b/modules/demux/avi/libavi.c
-index ad65ecb..ffbb3f9 100644
---- a/modules/demux/avi/libavi.c
-+++ b/modules/demux/avi/libavi.c
-@@ -795,12 +795,15 @@ void _AVI_ChunkFree( stream_t *s,
- }
-
- static void AVI_ChunkDumpDebug_level( vlc_object_t *p_obj,
-- avi_chunk_t *p_chk, int i_level )
-+ avi_chunk_t *p_chk, unsigned i_level )
- {
-- char str[1024];
-- int i;
-+ unsigned i;
- avi_chunk_t *p_child;
-
-+ char str[512];
-+ if( i_level * 5 + 1 >= sizeof(str) )
-+ return;
-+
- memset( str, ' ', sizeof( str ) );
- for( i = 1; i < i_level; i++ )
- {
-@@ -810,7 +813,7 @@ static void AVI_ChunkDumpDebug_level( vlc_object_t *p_obj,
- p_chk->common.i_chunk_fourcc == AVIFOURCC_ON2 ||
- p_chk->common.i_chunk_fourcc == AVIFOURCC_LIST )
- {
-- sprintf( str + i_level * 5,
-+ snprintf( &str[i_level * 5], sizeof(str) - 5*i_level,
- "%c %4.4s-%4.4s size:%"PRIu64" pos:%"PRIu64,
- i_level ? '+' : '*',
- (char*)&p_chk->common.i_chunk_fourcc,
-@@ -820,7 +823,7 @@ static void AVI_ChunkDumpDebug_level( vlc_object_t *p_obj,
- }
- else
- {
-- sprintf( str + i_level * 5,
-+ snprintf( &str[i_level * 5], sizeof(str) - 5*i_level,
- "+ %4.4s size:%"PRIu64" pos:%"PRIu64,
- (char*)&p_chk->common.i_chunk_fourcc,
- p_chk->common.i_chunk_size,
---
-1.6.4
-
diff --git
a/source/xmultimedia-extra/vlc/0002-Fixed-potential-stack-overflow-in-mp4-demuxer.patch
b/source/xmultimedia-extra/vlc/0002-Fixed-potential-stack-overflow-in-mp4-demuxer.patch
deleted file mode 100644
index 74b8d0c..0000000
---
a/source/xmultimedia-extra/vlc/0002-Fixed-potential-stack-overflow-in-mp4-demuxer.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From c5b02d011b8c634d041167f4d2936b55eca4d18d Mon Sep 17 00:00:00 2001
-From: Laurent Aimar <fen...@videolan.org>
-Date: Tue, 15 Sep 2009 21:03:42 +0200
-Subject: [PATCH] Fixed potential stack overflow in mp4 demuxer.
-
-Reported by Sebastian Apelt, Siberas.
----
- modules/demux/mp4/libmp4.c | 16 +++++++++++-----
- 1 files changed, 11 insertions(+), 5 deletions(-)
-
-diff --git a/modules/demux/mp4/libmp4.c b/modules/demux/mp4/libmp4.c
-index 8df00de..f8869a5 100644
---- a/modules/demux/mp4/libmp4.c
-+++ b/modules/demux/mp4/libmp4.c
-@@ -2876,18 +2876,24 @@ static void __MP4_BoxDumpStructure( stream_t *s,
- }
- else
- {
-- char str[512];
- unsigned int i;
-- memset( str, (uint8_t)' ', 512 );
-+
-+ char str[512];
-+ if( i_level * 5 + 1 >= sizeof(str) )
-+ return;
-+
-+ memset( str, ' ', sizeof(str) );
- for( i = 0; i < i_level; i++ )
- {
- str[i*5] = '|';
- }
-- if MP4_BOX_TYPE_ASCII()
-- sprintf( str + i_level * 5, "+ %4.4s size %d",
-+ if( MP4_BOX_TYPE_ASCII() )
-+ snprintf( &str[i_level * 5], sizeof(str) - 5*i_level,
-+ "+ %4.4s size %d",
- (char*)&p_box->i_type, (uint32_t)p_box->i_size );
- else
-- sprintf( str + i_level * 5, "+ c%3.3s size %d",
-+ snprintf( &str[i_level * 5], sizeof(str) - 5*i_level,
-+ "+ c%3.3s size %d",
- (char*)&p_box->i_type+1, (uint32_t)p_box->i_size );
- msg_Dbg( s, "%s", str );
- }
---
-1.6.4
-
diff --git
a/source/xmultimedia-extra/vlc/0003-Fixed-potential-stack-overflow-in-asf-demuxer.patch
b/source/xmultimedia-extra/vlc/0003-Fixed-potential-stack-overflow-in-asf-demuxer.patch
deleted file mode 100644
index ad11cc9..0000000
---
a/source/xmultimedia-extra/vlc/0003-Fixed-potential-stack-overflow-in-asf-demuxer.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From dfe7084e8cc64e9b7a87cd37065b59cba2064823 Mon Sep 17 00:00:00 2001
-From: Laurent Aimar <fen...@videolan.org>
-Date: Tue, 15 Sep 2009 21:00:14 +0200
-Subject: [PATCH] Fixed potential stack overflow in asf demuxer.
-
-Reported by Sebastian Apelt, Siberas.
----
- modules/demux/asf/libasf.c | 11 +++++++----
- 1 files changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/modules/demux/asf/libasf.c b/modules/demux/asf/libasf.c
-index 6b5e07b..4b49222 100644
---- a/modules/demux/asf/libasf.c
-+++ b/modules/demux/asf/libasf.c
-@@ -1471,10 +1471,9 @@ static const struct
-
-
- static void ASF_ObjectDumpDebug( vlc_object_t *p_obj,
-- asf_object_common_t *p_node, int i_level )
-+ asf_object_common_t *p_node, unsigned
i_level )
- {
-- char str[1024];
-- int i;
-+ unsigned i;
- union asf_object_u *p_child;
- const char *psz_name;
-
-@@ -1487,12 +1486,16 @@ static void ASF_ObjectDumpDebug( vlc_object_t *p_obj,
- }
- psz_name = ASF_ObjectDumpDebugInfo[i].psz_name;
-
-+ char str[512];
-+ if( i_level * 5 + 1 >= sizeof(str) )
-+ return;
-+
- memset( str, ' ', sizeof( str ) );
- for( i = 1; i < i_level; i++ )
- {
- str[i * 5] = '|';
- }
-- snprintf( str + 5*i_level, 1024,
-+ snprintf( &str[5*i_level], sizeof(str) - 5*i_level,
- "+ '%s' GUID "GUID_FMT" size:%"PRIu64"pos:%"PRIu64,
- psz_name,
- GUID_PRINT( p_node->i_object_id ),
---
-1.6.4
-
diff --git a/source/xmultimedia-extra/vlc/FrugalBuild
b/source/xmultimedia-extra/vlc/FrugalBuild
index 844214c..e0e7ee1 100644
--- a/source/xmultimedia-extra/vlc/FrugalBuild
+++ b/source/xmultimedia-extra/vlc/FrugalBuild
@@ -3,9 +3,9 @@
# Contributor: VMiklos <vmik...@frugalware.org>
pkgname=vlc
-pkgver=1.0.6
+pkgver=1.1.0
pkgextraver=
-pkgrel=2
+pkgrel=1
pkgdesc="The cross-platform media player and streaming server."
url="http://www.videolan.org/vlc/";
depends=('hal' 'e2fsprogs' 'libxpm>=3.5.8-1' 'libxdmcp' 'libshout' 'avahi'
'libdvbpsi' 'libsmbclient' 'vcdimager>=0.7.23-4' 'libdvdnav>=4.1.3' \
@@ -17,9 +17,8 @@ options=('scriptlet')
groups=('xmultimedia-extra')
archs=('i686' 'x86_64')
up2date="lynx -dump $url/download-sources.html|grep -m1 'Latest VLC'|sed
's/.*(\(.*\)).*/\1/;s/$pkgextraver//'"
-source=(http://download.videolan.org/pub/videolan/vlc/$pkgver$pkgextraver/$pkgname-$pkgver$pkgextraver.tar.bz2
libpng-1.4.diff)
-sha1sums=('834346a84a71d915440b7741e04b6e02de451786' \
- 'ac5b8fadd1c14f7c66d05eedba1cfdeff47b170b')
+source=(http://download.videolan.org/pub/videolan/vlc/$pkgver$pkgextraver/$pkgname-$pkgver$pkgextraver.tar.bz2)
+sha1sums=('b3545548d9d99942f7a463d2758dcbc7ad250b05')
build()
{
@@ -90,7 +89,6 @@ build()
--enable-svg \
--enable-fb \
--enable-aa \
-# --enable-caca \
--enable-alsa \
--enable-skins2 \
--enable-qt4 \
@@ -100,7 +98,6 @@ build()
--disable-optimizations \
--with-gnu-ld \
--enable-dvbpsi \
- #--with-dvbpsi=/usr/include/dvbpsi \
--enable-live555 \
--with-live555-tree=/usr/lib/live \
--enable-upnp \
@@ -109,11 +106,6 @@ build()
Fmakeinstall plugindir=/usr/lib/mozilla/plugins/ \
vlcintf_xptdir=/usr/lib/mozilla/plugins/
Frm /usr/share/vlc/{,k,q,g,gnome-}vlc*.{png,xpm,ico}
- for i in 16 32 48
- do
- Ffilerel share/vlc${i}x$i.png \
- /usr/share/icons/hicolor/${i}x$i/apps/vlc.png
- done
}
diff --git a/source/xmultimedia-extra/vlc/libpng-1.4.diff
b/source/xmultimedia-extra/vlc/libpng-1.4.diff
deleted file mode 100644
index b06d77a..0000000
--- a/source/xmultimedia-extra/vlc/libpng-1.4.diff
+++ /dev/null
@@ -1,21 +0,0 @@
---- vlc-1.0.4/modules/codec/png.c~ 2010-01-19 02:31:45.575326077 +0100
-+++ vlc-1.0.4/modules/codec/png.c 2010-01-19 02:32:21.465321175 +0100
-@@ -155,7 +155,7 @@
- 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, NULL, NULL );
- block_Release( p_block ); *pp_block = NULL;
- return NULL;
- }
-@@ -163,7 +163,7 @@
- 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, NULL );
- block_Release( p_block ); *pp_block = NULL;
- return NULL;
- }
-
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
