Author: kwizart Update of /cvs/free/rpms/vlc/F-8 In directory se02.es.rpmfusion.net:/tmp/cvs-serv16284 Modified Files: vlc.spec Added Files: vlc-0.8.7-rpmfusion2_head.patch Log Message: Sync from F-9 vlc-0.8.7-rpmfusion2_head.patch: --- NEW FILE vlc-0.8.7-rpmfusion2_head.patch --- diff --git a/extras/contrib/bootstrap b/extras/contrib/bootstrap index 77c6733..38f50c2 100755 --- a/extras/contrib/bootstrap +++ b/extras/contrib/bootstrap @@ -88,6 +88,30 @@ case $HOST in EXTRA_LDFLAGS=" -isysroot \${MACOSX_SDK} -Wl,-syslibroot,\${MACOSX_SDK}" echo "PATH = /bin:/usr/bin:/usr/local/bin" >> config.mak ;; + i686-apple-darwin9) + SDK_TARGET=10.4 + MIN_LD_VERSION_WITH_TEXT_RELOCATION=81 + echo "SDK_TARGET = ${SDK_TARGET}" >> config.mak + echo "HAVE_DARWIN_OS = 1" >> config.mak + echo "HAVE_DARWIN_OS_ON_INTEL = 1" >> config.mak + echo "HAVE_DARWIN_9 = 1" >> config.mak + if test `ld -v 2> /dev/stdout | sed -E 's/.*ld64-([0-9]+).*/\1/'` -lt ${MIN_LD_VERSION_WITH_TEXT_RELOCATION}; then + echo "Please update your developer tools - ld is broken" + exit 1 + fi + echo "ENVP = MACOSX_DEPLOYMENT_TARGET=${SDK_TARGET}" >> config.mak + echo "MACOSX_SDK = /Developer/SDKs/MacOSX10.4u.sdk" >> config.mak + CFLAGS_TUNING=" -march=pentium-m -mtune=prescott" + EXTRA_CFLAGS=" -D\${ENVP} -isysroot \${MACOSX_SDK} -mmacosx-version-min=\${SDK_TARGET}" + EXTRA_LDFLAGS=" -isysroot \${MACOSX_SDK} -Wl,-syslibroot,\${MACOSX_SDK}" + echo "PATH = /bin:/usr/bin:/usr/local/bin" >> config.mak + if test -e /Developer/SDKs; then + echo "SDKs found. Everything is fine." >&2 + else + echo "ERROR:\nYour Developer Tools' SDKs were not found.\nYou need to add extra symbolic links to /Developer to achieve correctly\nbuilt contribs.\nHave a look at the OSX-Compile-HOWTO for details." >&2 + exit 1 + fi + ;; i586-pc-beos) echo "HAVE_BEOS = 1" >> config.mak if test -f /boot/beos/system/lib/libbind.so; then diff --git a/modules/access_output/http.c b/modules/access_output/http.c index ecd1ea3..9ce8371 100644 --- a/modules/access_output/http.c +++ b/modules/access_output/http.c @@ -180,45 +180,36 @@ static int Open( vlc_object_t *p_this ) psz_bind_addr = psz_parser = strdup( p_access->psz_name ); i_bind_port = 0; - psz_file_name = ""; - while( *psz_parser && *psz_parser != ':' && *psz_parser != '/' ) - { - psz_parser++; - } - if( *psz_parser == ':' ) + psz_parser = strchr( psz_bind_addr, '/' ); + if( psz_parser ) { + psz_file_name = strdup( psz_parser ); *psz_parser = '\0'; - psz_parser++; - i_bind_port = atoi( psz_parser ); - - while( *psz_parser && *psz_parser != '/' ) - { - psz_parser++; - } } - if( *psz_parser == '/' ) - { - *psz_parser = '\0'; - psz_parser++; - psz_file_name = psz_parser; - } - - if( !*psz_file_name ) - { + else psz_file_name = strdup( "/" ); - } - else if( *psz_file_name != '/' ) - { - char *p = psz_file_name; - psz_file_name = malloc( strlen( p ) + 2 ); - strcpy( psz_file_name, "/" ); - strcat( psz_file_name, p ); + if( psz_bind_addr[0] == '[' ) + { + psz_bind_addr++; + psz_parser = strstr( psz_bind_addr, "]:" ); + if( psz_parser ) + { + *psz_parser = '\0'; + i_bind_port = atoi( psz_parser + 2 ); + } + psz_parser = psz_bind_addr - 1; } else { - psz_file_name = strdup( psz_file_name ); + psz_parser = strrchr( psz_bind_addr, ':' ); + if( psz_parser ) + { + *psz_parser = '\0'; + i_bind_port = atoi( psz_parser + 1 ); + } + psz_parser = psz_bind_addr; } /* SSL support */ @@ -244,14 +235,14 @@ static int Open( vlc_object_t *p_this ) psz_crl ); if( p_sys->p_httpd_host == NULL ) { - msg_Err( p_access, "cannot listen on %s:%d", + msg_Err( p_access, "cannot listen on %s port %d", psz_bind_addr, i_bind_port ); free( psz_file_name ); - free( psz_bind_addr ); + free( psz_parser ); free( p_sys ); return VLC_EGENERIC; } - free( psz_bind_addr ); + free( psz_parser ); if( p_access->psz_access && !strcmp( p_access->psz_access, "mmsh" ) ) { diff --git a/modules/mux/mp4.c b/modules/mux/mp4.c index 31e8f2e..85d6513 100644 --- a/modules/mux/mp4.c +++ b/modules/mux/mp4.c @@ -723,7 +723,6 @@ static void ConvertAVC1( sout_mux_t *p_mux, mp4_stream_t *tk, block_t *p_block ) memcpy( tk->avc.sps, &last[4], i_size ); tk->avc.i_profile = tk->avc.sps[1]; - tk->avc.i_profile = tk->avc.sps[2]; tk->avc.i_profile_compat = tk->avc.sps[2]; tk->avc.i_level = tk->avc.sps[3]; } Index: vlc.spec =================================================================== RCS file: /cvs/free/rpms/vlc/F-8/vlc.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- vlc.spec 8 Sep 2008 16:15:53 -0000 1.4 +++ vlc.spec 15 Sep 2008 20:12:32 -0000 1.5 @@ -19,9 +19,8 @@ Summary: Multi-platform MPEG, DVD, and DivX player Name: vlc Version: 0.8.7 -%define release_tag 0.2 %define _version 0.8.6i -Release: %{release_tag}%{?dist} +Release: 0.3%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.videolan.org/ @@ -54,7 +53,7 @@ # git-diff tags/vlc-0.8.6i HEAD > vlc-0.8.7-git_head-$(date +%Y%m%d ).patch # tar cjvf vlc-0.8.7-git_head-$(date +%Y%m%d ).patch.tar.bz2 Patch99: vlc-0.8.7-git_head-20080908.patch.tar.bz2 -Patch100: vlc-trunk-default_font.patch +Patch100: vlc-0.8.7-rpmfusion2_head.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -327,7 +326,8 @@ %patch90 -p1 -b .vlvc %patch91 -p1 -b .vlvcfix %endif -%patch99 -p1 -b .vlc87 +%patch99 -p1 -b .vlc87_1 +%patch100 -p1 -b .vlc87_2 %{?_with_clinkcc: #hack for clinkcc support - optional feature - under testing. @@ -663,6 +663,10 @@ %changelog +* Mon Sep 15 2008 kwizart < kwizart at gmail.com > - 0.8.7-0.3 +- Update to 20080915 from 0.8.6-bugfix +- BR live555-devel only + * Mon Sep 8 2008 kwizart < kwizart at gmail.com > - 0.8.7-0.2 - Update to 0.8.6-bugfix Security updates: