rpms/vlc/devel vlc-1.0-bugfix-bp-font_family.patch, NONE, 1.1 vlc.spec, 1.51, 1.52
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv2685
Modified Files:
vlc.spec
Added Files:
vlc-1.0-bugfix-bp-font_family.patch
Log Message:
- Backport zip qt4 from 1.0-bugfix
- Backport font_family from master
vlc-1.0-bugfix-bp-font_family.patch:
--- NEW FILE vlc-1.0-bugfix-bp-font_family.patch ---
diff --git a/modules/misc/freetype.c b/modules/misc/freetype.c
index 7e45866..0dc3143 100644
--- a/modules/misc/freetype.c
+++ b/modules/misc/freetype.c
@@ -70,6 +70,8 @@
#ifdef HAVE_FONTCONFIG
#include <fontconfig/fontconfig.h>
+#undef DEFAULT_FONT
+#define DEFAULT_FONT FC_DEFAULT_FONT
#endif
#include <assert.h>
@@ -81,7 +83,13 @@ static int Create ( vlc_object_t * );
static void Destroy( vlc_object_t * );
#define FONT_TEXT N_("Font")
-#define FONT_LONGTEXT N_("Filename for the font you want to use")
+
+#ifdef HAVE_FONTCONFIG
+#define FONT_LONGTEXT N_("Font family for the font you want to use")
+#else
+#define FONT_LONGTEXT N_("Fontfile for the font you want to use")
+#endif
+
#define FONTSIZE_TEXT N_("Font size in pixels")
#define FONTSIZE_LONGTEXT N_("This is the default size of the fonts " \
"that will be rendered on the video. " \
@@ -284,9 +292,15 @@ static int Create( vlc_object_t *p_this )
{
filter_t *p_filter = (filter_t *)p_this;
filter_sys_t *p_sys;
- char *psz_fontfile = NULL;
- int i_error;
- vlc_value_t val;
+ char *psz_fontfile=NULL;
+ char *psz_fontfamily=NULL;
+ int i_error,fontindex;
+
+#ifdef HAVE_FONTCONFIG
+ FcPattern *fontpattern, *fontmatch;
+ FcResult fontresult;
+#endif
+
/* Allocate structure */
p_filter->p_sys = p_sys = malloc( sizeof( filter_sys_t ) );
@@ -297,52 +311,77 @@ static int Create( vlc_object_t *p_this )
p_sys->i_font_size = 0;
p_sys->i_display_height = 0;
- var_Create( p_filter, "freetype-font",
- VLC_VAR_STRING | VLC_VAR_DOINHERIT );
- var_Create( p_filter, "freetype-fontsize",
- VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
var_Create( p_filter, "freetype-rel-fontsize",
VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- var_Create( p_filter, "freetype-opacity",
- VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- var_Create( p_filter, "freetype-effect",
- VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- var_Get( p_filter, "freetype-opacity", &val );
- p_sys->i_font_opacity = __MAX( __MIN( val.i_int, 255 ), 0 );
- var_Create( p_filter, "freetype-color",
- VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- var_Get( p_filter, "freetype-color", &val );
- p_sys->i_font_color = __MAX( __MIN( val.i_int, 0xFFFFFF ), 0 );
- p_sys->i_effect = var_GetInteger( p_filter, "freetype-effect" );
-
- /* Look what method was requested */
- var_Get( p_filter, "freetype-font", &val );
- psz_fontfile = val.psz_string;
- if( !psz_fontfile || !*psz_fontfile )
+
+ psz_fontfamily = var_CreateGetString( p_filter, "freetype-font" );
+ p_sys->i_default_font_size = var_CreateGetInteger( p_filter, "freetype-fontsize" );
+ p_sys->i_effect = var_CreateGetInteger( p_filter, "freetype-effect" );
+ p_sys->i_font_opacity = var_CreateGetInteger( p_filter,"freetype-opacity" );
+ p_sys->i_font_opacity = __MAX( __MIN( p_sys->i_font_opacity, 255 ), 0 );
+ p_sys->i_font_color = var_CreateGetInteger( p_filter, "freetype-color" );
+ p_sys->i_font_color = __MAX( __MIN( p_sys->i_font_color , 0xFFFFFF ), 0 );
+
+ fontindex=0;
+ if( !psz_fontfamily || !*psz_fontfamily )
{
- free( psz_fontfile );
- psz_fontfile = (char *)malloc( PATH_MAX + 1 );
- if( !psz_fontfile )
- goto error;
-#ifdef WIN32
- GetWindowsDirectory( psz_fontfile, PATH_MAX + 1 );
- strcat( psz_fontfile, "\\fonts\\arial.ttf" );
-#elif defined(__APPLE__)
- strcpy( psz_fontfile, DEFAULT_FONT );
+#ifdef HAVE_FONTCONFIG
+ free( psz_fontfamily);
+ psz_fontfamily=strdup( DEFAULT_FONT );
#else
- msg_Err( p_filter, "user didn't specify a font" );
- goto error;
+ free( psz_fontfamily );
+ psz_fontfamily = (char *)malloc( PATH_MAX + 1 );
+ if( !psz_fontfamily )
+ goto error;
+# ifdef WIN32
+ GetWindowsDirectory( psz_fontfamily , PATH_MAX + 1 );
+ strcat( psz_fontfamily, "\\fonts\\arial.ttf" );
+# else
+ strcpy( psz_fontfamily, DEFAULT_FONT );
+# endif
+ msg_Err( p_filter,"User didn't specify fontfile, using %s", psz_fontfamily);
#endif
}
+#ifdef HAVE_FONTCONFIG
+ /* Lets find some fontfile from freetype-font variable family */
+ char *psz_fontsize;
+ if( asprintf( &psz_fontsize, "%d", p_sys->i_default_font_size ) == -1 )
+ goto error;
+ fontpattern = FcPatternCreate();
+ FcPatternAddString( fontpattern, FC_FAMILY, psz_fontfamily);
+ FcPatternAddString( fontpattern, FC_SIZE, psz_fontsize );
+
+ if( FcConfigSubstitute( NULL, fontpattern, FcMatchPattern ) == FcFalse )
+ {
+ FcPatternDestroy( fontpattern );
+ free( psz_fontsize );
+ goto error;
+ }
+ FcDefaultSubstitute( fontpattern );
+
+ fontmatch = FcFontMatch( NULL, fontpattern, &fontresult );
+
+ FcPatternGetString( fontmatch, FC_FILE, 0, (FcChar8 **)&psz_fontfile);
+ FcPatternGetInteger( fontmatch, FC_INDEX, 0, &fontindex );
+ if( !psz_fontfile )
+ goto error;
+ msg_Dbg( p_filter, "Using %s as font from file %s", psz_fontfamily, psz_fontfile);
+ free( psz_fontsize );
+#else
+ psz_fontfile = psz_fontfamily;
+#endif
+
i_error = FT_Init_FreeType( &p_sys->p_library );
if( i_error )
{
msg_Err( p_filter, "couldn't initialize freetype" );
goto error;
}
+
i_error = FT_New_Face( p_sys->p_library, psz_fontfile ? psz_fontfile : "",
- 0, &p_sys->p_face );
+ fontindex, &p_sys->p_face );
+
if( i_error == FT_Err_Unknown_File_Format )
{
msg_Err( p_filter, "file %s have unknown format", psz_fontfile );
@@ -369,11 +408,8 @@ static int Create( vlc_object_t *p_this )
p_sys->i_use_kerning = FT_HAS_KERNING( p_sys->p_face );
- var_Get( p_filter, "freetype-fontsize", &val );
- p_sys->i_default_font_size = val.i_int;
if( SetFontSize( p_filter, 0 ) != VLC_SUCCESS ) goto error;
- free( psz_fontfile );
p_sys->pp_font_attachments = NULL;
p_sys->i_font_attachments = 0;
@@ -381,10 +417,13 @@ static int Create( vlc_object_t *p_this )
p_filter->pf_render_text = RenderText;
#ifdef HAVE_FONTCONFIG
p_filter->pf_render_html = RenderHtml;
+ FcPatternDestroy( fontmatch );
+ FcPatternDestroy( fontpattern );
#else
p_filter->pf_render_html = NULL;
#endif
+ free( psz_fontfamily );
LoadFontsFromAttachments( p_filter );
return VLC_SUCCESS;
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- vlc.spec 28 Jul 2009 12:48:37 -0000 1.51
+++ vlc.spec 28 Jul 2009 13:46:03 -0000 1.52
@@ -23,6 +23,7 @@
Patch3: 300_all_pic.patch
Patch4: 310_all_mmx_pic.patch
Patch5: vlc-1.0-bugfix-bp_zip_qt4.patch
+Patch6: vlc-1.0-bugfix-bp-font_family.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
@@ -238,6 +239,7 @@
sed -i.dmo_pic -e 's/fno-PIC/fPIC/' libs/loader/Makefile.in
%patch4 -p1 -b .mmx_pic
%patch5 -p1 -b .bp5
+%patch6 -p1 -b .bp_ff
rm modules/access/videodev2.h
@@ -552,6 +554,8 @@
* Mon Jul 27 2009 kwizart < kwizart at gmail.com > - 1.0.1-1
- Update to 1.0.1 (Final)
- Improve conditionals
+- Backport zip qt4 from 1.0-bugfix
+- Backport font_family from master
* Mon Jul 6 2009 kwizart < kwizart at gmail.com > - 1.0.0-1
- Update to 1.0.0 (Final)
14 years, 9 months
rpms/vlc/devel vlc.spec,1.50,1.51
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31518
Modified Files:
vlc.spec
Log Message:
Fix m4
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- vlc.spec 28 Jul 2009 12:35:53 -0000 1.50
+++ vlc.spec 28 Jul 2009 12:48:37 -0000 1.51
@@ -243,7 +243,7 @@
rm modules/access/videodev2.h
ln -sf %{_includedir}/linux/videodev2.h modules/access/videodev2.h
%if 0%{?vlc_bootstrap:1}
-rm aclocal.m4 m4/lib*.m4 lt*.m4
+rm aclocal.m4 m4/lib*.m4 m4/lt*.m4
./bootstrap
%endif
14 years, 9 months
rpms/vlc/devel vlc.spec,1.49,1.50
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30981
Modified Files:
vlc.spec
Log Message:
Fix for older lt
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- vlc.spec 28 Jul 2009 12:17:18 -0000 1.49
+++ vlc.spec 28 Jul 2009 12:35:53 -0000 1.50
@@ -243,7 +243,7 @@
rm modules/access/videodev2.h
ln -sf %{_includedir}/linux/videodev2.h modules/access/videodev2.h
%if 0%{?vlc_bootstrap:1}
-rm aclocal.m4 m4/lib*.m4
+rm aclocal.m4 m4/lib*.m4 lt*.m4
./bootstrap
%endif
14 years, 9 months
rpms/vlc/devel vlc.spec,1.48,1.49
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29949
Modified Files:
vlc.spec
Log Message:
Fix
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- vlc.spec 28 Jul 2009 12:16:57 -0000 1.48
+++ vlc.spec 28 Jul 2009 12:17:18 -0000 1.49
@@ -22,7 +22,7 @@
Patch2: 0002-Default-aout-for-pulse.patch
Patch3: 300_all_pic.patch
Patch4: 310_all_mmx_pic.patch
-Patch5: vlc-1.0-bugfix-bp_zip_qt4.patch&
+Patch5: vlc-1.0-bugfix-bp_zip_qt4.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
14 years, 9 months
rpms/vlc/devel vlc-1.0-bugfix-bp_zip_qt4.patch, NONE, 1.1 vlc.spec, 1.47, 1.48
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29914
Modified Files:
vlc.spec
Added Files:
vlc-1.0-bugfix-bp_zip_qt4.patch
Log Message:
BP 5
vlc-1.0-bugfix-bp_zip_qt4.patch:
--- NEW FILE vlc-1.0-bugfix-bp_zip_qt4.patch ---
diff --git a/modules/access/zip/zipstream.c b/modules/access/zip/zipstream.c
index 0250312..59b3f74 100644
--- a/modules/access/zip/zipstream.c
+++ b/modules/access/zip/zipstream.c
@@ -205,8 +205,8 @@ int StreamOpen( vlc_object_t *p_this )
if( !p_sys->zipFile )
{
msg_Warn( s, "unable to open file" );
- free( p_sys );
free( p_sys->fileFunctions );
+ free( p_sys );
return VLC_EGENERIC;
}
@@ -214,8 +214,8 @@ int StreamOpen( vlc_object_t *p_this )
char *psz_tmp;
if( asprintf( &psz_tmp, "%s.xspf", s->psz_path ) == -1 )
{
- free( p_sys );
free( p_sys->fileFunctions );
+ free( p_sys );
return VLC_ENOMEM;
}
p_sys->psz_path = s->psz_path;
diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index 97aca1a..31b990a 100644
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -1134,8 +1134,8 @@ void MainInterface::dropEventPlay( QDropEvent *event, bool b_play )
if( s.length() > 0 ) {
playlist_Add( THEPL, qtu(s), NULL,
- PLAYLIST_APPEND | (first ? PLAYLIST_GO: 0),
- PLAYLIST_END, true, false );
+ PLAYLIST_APPEND | (first ? PLAYLIST_GO: PLAYLIST_PREPARSE),
+ PLAYLIST_END, true, pl_Unlocked );
first = false;
RecentsMRL::getInstance( p_intf )->addRecent( s );
}
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- vlc.spec 28 Jul 2009 11:03:46 -0000 1.47
+++ vlc.spec 28 Jul 2009 12:16:57 -0000 1.48
@@ -22,6 +22,7 @@
Patch2: 0002-Default-aout-for-pulse.patch
Patch3: 300_all_pic.patch
Patch4: 310_all_mmx_pic.patch
+Patch5: vlc-1.0-bugfix-bp_zip_qt4.patch&
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
@@ -236,6 +237,7 @@
%patch3 -p1 -b .dmo_pic
sed -i.dmo_pic -e 's/fno-PIC/fPIC/' libs/loader/Makefile.in
%patch4 -p1 -b .mmx_pic
+%patch5 -p1 -b .bp5
rm modules/access/videodev2.h
14 years, 9 months
rpms/vlc/devel vlc.spec,1.46,1.47
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26068
Modified Files:
vlc.spec
Log Message:
Enable rebootstrap
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- vlc.spec 28 Jul 2009 11:02:28 -0000 1.46
+++ vlc.spec 28 Jul 2009 11:03:46 -0000 1.47
@@ -2,7 +2,7 @@
#global live555_date 2009.07.28
#global vlc_rc -rc4
-#global vlc_bootstrap 1
+%global vlc_bootstrap 1
Summary: Multi-platform MPEG, DVD, and DivX player
14 years, 9 months
rpms/vlc/devel .cvsignore, 1.19, 1.20 sources, 1.19, 1.20 vlc.spec, 1.45, 1.46
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26031
Modified Files:
.cvsignore sources vlc.spec
Log Message:
- Update to 1.0.1 (Final)
- Improve conditionals
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore 7 Jul 2009 11:08:19 -0000 1.19
+++ .cvsignore 28 Jul 2009 11:02:28 -0000 1.20
@@ -1,3 +1 @@
-vlc-1.0.0.tar.bz2
-enc_base.h
-shine.c
+vlc-1.0.1.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources 7 Jul 2009 11:08:19 -0000 1.19
+++ sources 28 Jul 2009 11:02:28 -0000 1.20
@@ -1,3 +1 @@
-fc78904ab5fa73f518d8fe4e852e7f67 vlc-1.0.0.tar.bz2
-a897e4f24fb3fb993db7daf5a5f4d551 enc_base.h
-c64e9e104b1eeba838a6c87435c6533c shine.c
+6e299d373e7751bb36de001cdc6a2989 vlc-1.0.1.tar.bz2
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- vlc.spec 7 Jul 2009 11:21:56 -0000 1.45
+++ vlc.spec 28 Jul 2009 11:02:28 -0000 1.46
@@ -1,27 +1,22 @@
# TODO: libdc1394(juju), modularization (vlc-plugin-foo)
-%define with_internal_live555 0
-%define live555_date 2008.07.25
-#define vlc_rc -rc4
-%define with_mozilla 1
-%define with_dc1394 0
-%define with_directfb 1
+#global live555_date 2009.07.28
+#global vlc_rc -rc4
+#global vlc_bootstrap 1
Summary: Multi-platform MPEG, DVD, and DivX player
Name: vlc
-Version: 1.0.0
+Version: 1.0.1
Release: 1%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org
Source0: http://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{version}%{...
-%if %with_internal_live555
+%if 0%{?live555_date:1}
Source2: http://www.live555.com/liveMedia/public/live.%{live555_date}.tar.gz
%endif
Source10: vlc-handlers.schemas
-Source11: shine.c
-Source12: enc_base.h
Patch0: vlc-trunk-default_font.patch
Patch1: 0001-Default-libv4l2-to-true.patch
Patch2: 0002-Default-aout-for-pulse.patch
@@ -29,10 +24,11 @@
Patch4: 310_all_mmx_pic.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: desktop-file-utils
+BuildRequires: desktop-file-utils
BuildRequires: gettext
+BuildRequires: prelink
-%if 1
+%if 0%{?vlc_bootstrap:1}
BuildRequires: gettext-devel
BuildRequires: libtool
%endif
@@ -44,9 +40,7 @@
BuildRequires: cdparanoia-devel
BuildRequires: dbus-devel
BuildRequires: dirac-devel >= 1.0.0
-%if %with_directfb
-BuildRequires: directfb-devel
-%endif
+%{!?_without_directfb:BuildRequires: directfb-devel}
BuildRequires: faac-devel
BuildRequires: faad2-devel
BuildRequires: ffmpeg-devel >= 0.4.9-0
@@ -68,7 +62,6 @@
BuildRequires: libdvbpsi-devel
BuildRequires: libdvdnav-devel
BuildRequires: libebml-devel
-BuildRequires: libhildon-devel
BuildRequires: libid3tag-devel
BuildRequires: libkate-devel
BuildRequires: libmad-devel
@@ -93,12 +86,12 @@
BuildRequires: libvorbis-devel
BuildRequires: libxml2-devel
BuildRequires: lirc-devel
-%if %with_internal_live555
+%if 0%{?live555_date:1}
BuildConflicts: live555-devel
%else
BuildRequires: live555-devel >= 0-0.19.2008.04.03
%endif
-BuildRequires: kernel-headers >= 2.6.20
+BuildRequires: kernel-headers
BuildRequires: libGL-devel
BuildRequires: libGLU-devel
BuildRequires: libmusicbrainz-devel
@@ -109,7 +102,6 @@
BuildRequires: opencv-devel
BuildRequires: openslp-devel
BuildRequires: pcre-devel
-BuildRequires: prelink
BuildRequires: pulseaudio-libs-devel >= 0.9.8
BuildRequires: portaudio-devel
BuildRequires: qt4-devel >= 4.5.2
@@ -142,18 +134,9 @@
BuildRequires: xorg-x11-proto-devel
-%if %with_mozilla
-BuildRequires: gecko-devel
-BuildRequires: nspr-devel
-%else
-Obsoletes: mozilla-vlc < %{version}-%{release}
-%endif
-
-
-%if %with_dc1394
-BuildRequires: compat-libdc1394-devel
-BuildRequires: compat-libraw1394-devel
-%endif
+%{!?_without_mozilla:BuildRequires: gecko-devel nspr-devel}
+%{?_without_mozilla:Obsoletes: mozilla-vlc < %{version}-%{release}}
+%{?_with_dc1394: BuildRequires: compat-libdc1394-devel compat-libraw1394-devel}
Requires: vlc-core = %{version}-%{release}
@@ -164,6 +147,7 @@
%endif
Requires: qt-x11%{_isa} >= 1:4.5.2
+
%package devel
Summary: Development package for %{name}
Group: Development/Libraries
@@ -188,7 +172,7 @@
It can also be used as a server to stream in unicast or multicast in
IPv4 or IPv6 on a high-bandwidth network.
-%if %with_mozilla
+%{!?_without_mozilla:
%package -n mozilla-vlc
Summary: VLC Media Player plugin for Mozilla compatible web browsers
Group: Applications/Multimedia
@@ -204,7 +188,7 @@
mp3, ogg, ...) as well as DVDs, VCDs, and various streaming protocols.
It can also be used as a server to stream in unicast or multicast in
IPv4 or IPv6 on a high-bandwidth network.
-%endif
+}
%package core
Summary: VLC Media Player core
@@ -230,20 +214,19 @@
JACK audio plugin for the VLC media player.
-%if %with_dc1394
+%{?_with_dc1394:
%package plugin-dc1394
Summary: VLC Media Player Plugins for dc1394
Group: Applications/Multimedia
Requires: %{name}-core = %{version}
-Requires: compat-libdc1394-tools
%description plugin-dc1394
VLC plugin for libdc1394
-%endif
+}
%prep
%setup -q -n %{name}-%{version}%{?vlc_rc}
-%if %with_internal_live555
+%if 0%{?live555_date:1}
%setup -q -D -T -a 2 -n %{name}-%{version}%{?vlc_rc}
%endif
%patch0 -p1 -b .default_font
@@ -257,19 +240,15 @@
rm modules/access/videodev2.h
ln -sf %{_includedir}/linux/videodev2.h modules/access/videodev2.h
-%if 1
+%if 0%{?vlc_bootstrap:1}
rm aclocal.m4 m4/lib*.m4
./bootstrap
%endif
-#missing sources
-install -pm 0644 %{SOURCE11} modules/codec/shine
-install -pm 0644 %{SOURCE12} modules/codec/shine
-
%build
-%if %with_internal_live555
+%if 0%{?live555_date:1}
# Then bundled live555 - not needed
pushd live
# Force the use of our CFLAGS
@@ -289,12 +268,10 @@
--enable-switcher \
--enable-lua \
--enable-live555 \
-%if %with_internal_live555
+%if 0%{?live555_date:1}
--with-live555-tree=live \
%endif
-%if %with_dc1394
- --enable-dc1394 \
-%endif
+%{?_with_dc1394:--enable-dc1394} \
--enable-dv \
--enable-opencv \
--enable-pvr \
@@ -321,9 +298,7 @@
--enable-svgalib \
--enable-xvmc \
%endif
-%if %with_directfb
- --enable-directfb \
-%endif
+%{!?_without_directfb:--enable-directfb} \
--enable-aa \
--enable-caca \
--enable-jack \
@@ -341,9 +316,8 @@
%else
--without-contrib \
%endif
-%if %with_mozilla
- --enable-mozilla \
-%endif
+%{!?_without_mozilla:--enable-mozilla} \
+
# remove rpath from libtool
@@ -516,9 +490,9 @@
%exclude %{_libdir}/vlc/video_output/libxvmc_plugin.so
%exclude %{_libdir}/vlc/video_output/libsvgalib_plugin.so
%endif
-%if %with_directfb
+%{!?_without_directfb:
%exclude %{_libdir}/vlc/video_output/libdirectfb_plugin.so
-%endif
+}
%exclude %{_libdir}/vlc/gui/libskins2_plugin.so
%exclude %{_libdir}/vlc/video_filter/libopencv_example_plugin.so
%exclude %{_libdir}/vlc/video_filter/libopencv_wrapper_plugin.so
@@ -526,9 +500,9 @@
%exclude %{_libdir}/vlc/audio_output/libjack_plugin.so
%exclude %{_libdir}/vlc/audio_output/libportaudio_plugin.so
%exclude %{_libdir}/vlc/audio_output/libpulse_plugin.so
-%if %with_dc1394
+%{?_with_dc1394:
%exclude %{_libdir}/vlc/access/libdc1394_plugin.so
-%endif
+}
%{_libdir}/vlc/
%{_mandir}/man1/vlc*.1*
@@ -541,16 +515,18 @@
%files nox
%defattr(-,root,root,-)
+%{!?_without_directfb:
%{_libdir}/vlc/video_output/libdirectfb_plugin.so
+}
%ifarch %{ix86} x86_64
%{_libdir}/vlc/video_output/libsvgalib_plugin.so
%endif
-%if %with_dc1394
-%files plugins-dc1394
+%{?_with_dc1394:
+%files plugin-dc1394
%defattr(-,root,root,-)
%{_libdir}/vlc/access/libdc1394_plugin.so
-%endif
+}
%files devel
%defattr(-,root,root,-)
@@ -562,15 +538,19 @@
%{_libdir}/pkgconfig/vlc-plugin.pc
%{_libdir}/pkgconfig/libvlc.pc
-%if %with_mozilla
+%{!?_without_mozilla:
%files -n mozilla-vlc
%defattr(-,root,root,-)
%{_libdir}/mozilla/plugins/libvlcplugin.so
-%endif
+}
%changelog
+* Mon Jul 27 2009 kwizart < kwizart at gmail.com > - 1.0.1-1
+- Update to 1.0.1 (Final)
+- Improve conditionals
+
* Mon Jul 6 2009 kwizart < kwizart at gmail.com > - 1.0.0-1
- Update to 1.0.0 (Final)
14 years, 9 months
rpms/freetype-freeworld/F-11 freetype-2.3.9-aliasing.patch, NONE, 1.1 freetype-freeworld.spec, 1.6, 1.7
by Kevin Kofler
Author: kkofler
Update of /cvs/free/rpms/freetype-freeworld/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv23985/F-11
Modified Files:
freetype-freeworld.spec
Added Files:
freetype-2.3.9-aliasing.patch
Log Message:
* Tue Jul 28 2009 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 2.3.9-3
- Add freetype-2.3.9-aliasing.patch to fix Navit crash (rh#513582)
freetype-2.3.9-aliasing.patch:
--- NEW FILE freetype-2.3.9-aliasing.patch ---
--- freetype-2.3.9.bak/src/cache/ftccache.h 2007-05-16 17:37:05.000000000 +0200
+++ freetype-2.3.9/src/cache/ftccache.h 2009-07-02 14:54:10.000000000 +0200
@@ -246,8 +246,7 @@
error = FTC_Cache_NewNode( _cache, _hash, query, &_node ); \
\
_Ok: \
- _pnode = (FTC_Node*)(void*)&(node); \
- *_pnode = _node; \
+ node = _node; \
FT_END_STMNT
#else /* !FTC_INLINE */
Index: freetype-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/freetype-freeworld/F-11/freetype-freeworld.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- freetype-freeworld.spec 28 Mar 2009 03:11:45 -0000 1.6
+++ freetype-freeworld.spec 28 Jul 2009 00:06:16 -0000 1.7
@@ -8,7 +8,7 @@
Summary: A free and portable font rendering engine
Name: freetype-freeworld
Version: 2.3.9
-Release: 2%{?dist}
+Release: 3%{?dist}
License: FTL or GPLv2+
Group: System Environment/Libraries
URL: http://www.freetype.org
@@ -24,6 +24,9 @@
# Fix crash https://bugs.freedesktop.org/show_bug.cgi?id=6841
Patch89: freetype-2.2.1-memcpy-fix.patch
+# Fix aliasing issue
+Patch90: freetype-2.3.9-aliasing.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
%if !0%{?without_bytecode_interpreter}
@@ -78,6 +81,7 @@
%patch46 -p1 -b .enable-valid
%patch89 -p1 -b .memcpy
+%patch90 -p1 -b .aliasing
%build
@@ -127,6 +131,9 @@
%config(noreplace) %{_sysconfdir}/fonts/conf.d/*.conf
%changelog
+* Tue Jul 28 2009 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 2.3.9-3
+- Add freetype-2.3.9-aliasing.patch to fix Navit crash (rh#513582)
+
* Sat Mar 28 2009 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 2.3.9-2
- Provides freetype-bytecode and freetype-subpixel (rh#155210)
14 years, 9 months
rpms/transcode/devel transcode.spec,1.17,1.18
by David Juran
Author: juran
Update of /cvs/free/rpms/transcode/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv17576
Modified Files:
transcode.spec
Log Message:
- Fix build problem
Index: transcode.spec
===================================================================
RCS file: /cvs/free/rpms/transcode/devel/transcode.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- transcode.spec 23 Jul 2009 18:10:35 -0000 1.17
+++ transcode.spec 25 Jul 2009 19:49:53 -0000 1.18
@@ -7,7 +7,7 @@
Name: transcode
Version: 1.1.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Video stream processing tool
Group: Applications/Multimedia
@@ -35,6 +35,7 @@
BuildRequires: ffmpeg-devel >= 0.4.9-0.46.20080614
BuildRequires: mpeg2dec-devel >= 0.4.0
BuildRequires: libtheora-devel
+BuildRequires: libXext-devel
BuildRequires: libXv-devel
BuildRequires: libXaw-devel
BuildRequires: libXpm-devel
@@ -137,6 +138,9 @@
%changelog
+* Sat Jul 25 2009 David Juran <david(a)juran.se> - 1.1.3-2
+- Fix build problem
+
* Tue Jul 21 2009 David Juran <david(a)juran.se> - 1.1.3-1
- Update to 1.1.3
14 years, 9 months
rpms/desmume/F-10 .cvsignore, 1.5, 1.6 desmume.spec, 1.7, 1.8 sources, 1.5, 1.6 desmume-0.9.2-64bit.patch, 1.1, NONE desmume-0.9.2-fix-ioregs-crash.patch, 1.1, NONE
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/desmume/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30320
Modified Files:
.cvsignore desmume.spec sources
Removed Files:
desmume-0.9.2-64bit.patch desmume-0.9.2-fix-ioregs-crash.patch
Log Message:
* Fri Jul 24 2009 Andrea Musuruane <musuruan(a)gmail.com> 0.9.4-1
- Updated to upstream version 0.9.4
- Added a fix to compile under gcc 4.4 (SF #2819176)
- Removed no longer needed patches
- Removed no longer needed Debian man pages
- Cosmetic changes
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/desmume/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 25 Apr 2009 10:04:26 -0000 1.5
+++ .cvsignore 24 Jul 2009 17:08:32 -0000 1.6
@@ -1,2 +1 @@
-desmume-0.9.2.tar.gz
-desmume-man-pages-0.7.3.tar.gz
+desmume-0.9.4.tar.gz
Index: desmume.spec
===================================================================
RCS file: /cvs/free/rpms/desmume/F-10/desmume.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- desmume.spec 30 Apr 2009 19:20:45 -0000 1.7
+++ desmume.spec 24 Jul 2009 17:08:32 -0000 1.8
@@ -1,20 +1,13 @@
Name: desmume
-Version: 0.9.2
-Release: 2%{?dist}
+Version: 0.9.4
+Release: 1%{?dist}
Summary: A Nintendo DS emulator
Group: Applications/Emulators
License: GPLv2+
URL: http://desmume.org/
Source0: http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz
-Source1: desmume-man-pages-0.7.3.tar.gz
Patch0: %{name}-0.9-dontlookinbuilddir.patch
-# Fix IO Regs menu
-# http://sourceforge.net/tracker/?func=detail&atid=832291&aid=2781065&group...
-Patch1: %{name}-0.9.2-fix-ioregs-crash.patch
-# Compile on 64 bit systems
-# http://sourceforge.net/tracker/?func=detail&aid=2755952&group_id=164579&a...
-Patch2: %{name}-0.9.2-64bit.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtkglext-devel
@@ -51,14 +44,13 @@
%prep
%setup -q
-%setup -q -T -D -a 1
-
%patch0 -p1
-%patch1 -p0
-%patch2 -p0
+
+# Fix to compile under gcc 4.4
+sed -i "s/TexCache_TexFormat format/TexCache_TexFormat/" src/texcache.h
# Fix end-of-line encoding
-sed -i 's/\r//' ChangeLog AUTHORS
+sed -i 's/\r//' AUTHORS
# Fix file encoding
for txtfile in ChangeLog AUTHORS
@@ -77,7 +69,6 @@
sed -i 's|gladedir = $(datadir)/desmume/glade|gladedir = $(datadir)/desmume-glade/|g' src/gtk-glade/Makefile.{am,in}
# We need a different icon for desmume-glade
-cp -a src/gtk/DeSmuME.xpm src/gtk-glade/DeSmuME-glade.xpm
sed -i 's|Icon=DeSmuME.xpm|Icon=DeSmuME-glade.xpm|g' src/gtk-glade/desmume-glade.desktop
# Fix gettext package name
@@ -93,19 +84,13 @@
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
-# Install man pages
-mkdir -p %{buildroot}%{_mandir}/man1/
-install -p -m0644 man/%{name}.1 %{buildroot}%{_mandir}/man1/
-install -p -m0644 man/%{name}-glade.1 %{buildroot}%{_mandir}/man1/
-install -p -m0644 man/%{name}-cli.1 %{buildroot}%{_mandir}/man1/
-
# Remove installed icon
rm %{buildroot}%{_datadir}/pixmaps/DeSmuME.xpm
# Install icons
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps
install -m 644 src/gtk/DeSmuME.xpm %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/
-install -m 644 src/gtk-glade/DeSmuME-glade.xpm %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/
+install -m 644 src/gtk/DeSmuME.xpm %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/DeSmuME-glade.xpm
# Rename desktop files and fix categories
mkdir -p %{buildroot}%{_datadir}/applications
@@ -189,6 +174,13 @@
%changelog
+* Fri Jul 24 2009 Andrea Musuruane <musuruan(a)gmail.com> 0.9.4-1
+- Updated to upstream version 0.9.4
+- Added a fix to compile under gcc 4.4 (SF #2819176)
+- Removed no longer needed patches
+- Removed no longer needed Debian man pages
+- Cosmetic changes
+
* Thu Apr 30 2009 Andrea Musuruane <musuruan(a)gmail.com> 0.9.2-2
- Added a patch from upstream to fix IO Regs menu crash (SF #2781065)
Index: sources
===================================================================
RCS file: /cvs/free/rpms/desmume/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 25 Apr 2009 10:04:26 -0000 1.5
+++ sources 24 Jul 2009 17:08:32 -0000 1.6
@@ -1,2 +1 @@
-51482de785dce04590532b946321196d desmume-0.9.2.tar.gz
-64cb8e6288b7490f097e20fb262f0e97 desmume-man-pages-0.7.3.tar.gz
+0e877fe4b99d99502173efa6efae05b1 desmume-0.9.4.tar.gz
--- desmume-0.9.2-64bit.patch DELETED ---
--- desmume-0.9.2-fix-ioregs-crash.patch DELETED ---
14 years, 9 months