rpms/xine-lib/devel xine-lib-1.1.4-ftfree.patch, NONE, 1.1 xine-lib.spec, 1.11, 1.12

[Ville Skytta (scop)]

Author: scop

Update of /cvs/extras/rpms/xine-lib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21140

Modified Files:
	xine-lib.spec 
Added Files:
	xine-lib-1.1.4-ftfree.patch 
Log Message:
* Mon Mar 26 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.4-4
- Add PulseAudio support (in -extras, #234035/Jost Diederichs).
- Adjust Samba build dependencies to work for both <= and > FC6.
- Add --with freetype and --with antialiasing build time options,
  default disabled, and an upstream patch for FreeType memory leak (#233194).


xine-lib-1.1.4-ftfree.patch:

--- NEW FILE xine-lib-1.1.4-ftfree.patch ---
--- src/xine-engine/osd.c	2007/02/20 00:34:58	1.84
+++ src/xine-engine/osd.c	2007/03/03 22:59:37	1.86
@@ -1481,7 +1481,16 @@
   while( osd ) {
     if ( osd == osd_to_close ) {
       free( osd->area );
-      if( osd->ft2 ) free( osd->ft2 );
+
+#ifdef HAVE_FT2
+      if( osd->ft2 ) {
+	if ( osd->ft2->library )
+	  FT_Done_FreeType(osd->ft2->library);
+
+	free( osd->ft2 );
+      }
+#endif
+
       osd_free_encoding(osd);
       
       if( last )


Index: xine-lib.spec
===================================================================
RCS file: /cvs/extras/rpms/xine-lib/devel/xine-lib.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xine-lib.spec	10 Mar 2007 22:13:01 -0000	1.11
+++ xine-lib.spec	26 Mar 2007 19:56:33 -0000	1.12
@@ -1,14 +1,12 @@
 # TODO, sometime, maybe:
 # - libstk:  http://www.libstk.net/
-# - pulseaudio
-# - --enable-antialiasing?
 
 %define         codecdir %{_libdir}/codecs
 
 Summary:        Xine library
 Name:           xine-lib
 Version:        1.1.4
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        GPL
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
@@ -23,13 +21,14 @@
 Patch1:         %{name}-1.1.4-optflags.patch
 Patch2:         %{name}-1.1.4-CVE-2007-1246.patch
 Patch3:         %{name}-1.1.3-legacy-flac-init.patch
+Patch4:         %{name}-1.1.4-ftfree.patch
 Patch6:         %{name}-1.1.1-deepbind-939.patch
 Patch7:         %{name}-1.1.1-multilib-devel.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # X11
 BuildRequires:  libX11-devel libXv-devel libXinerama-devel libXvMC-devel libGLU-devel
 # Video
-BuildRequires:  freetype-devel SDL-devel libtheora-devel libmng-devel
+BuildRequires:  SDL-devel libtheora-devel libmng-devel
 BuildRequires:  aalib-devel >= 1.4
 %if 0%{?_with_caca:1}
 BuildRequires:  libcaca-devel >= 0.99
@@ -40,14 +39,20 @@
 %if 0%{!?_without_imagemagick:1}
 BuildRequires:  ImageMagick-devel >= 6.2.4.6-1
 %endif
+%if 0%{?_with_freetype:1}
+BuildRequires:  fontconfig-devel
+%endif
 # Audio
 BuildRequires:  libogg-devel libvorbis-devel flac-devel libmodplug-devel
 BuildRequires:  esound-devel speex-devel arts-devel alsa-lib-devel >= 0.9.0
 BuildRequires:  jack-audio-connection-kit-devel wavpack-devel libmpcdec-devel
+BuildRequires:  pulseaudio-lib-devel
 # CDs
 BuildRequires:  libcdio-devel
 # Other
-BuildRequires:  pkgconfig gnome-vfs2-devel gtk2-devel samba-common
+BuildRequires:  pkgconfig gnome-vfs2-devel gtk2-devel
+# samba-common in <= FC-6, libsmbclient-devel in FC7+
+BuildRequires:  %{_includedir}/libsmbclient.h
 
 %package devel
 Summary:         Xine library development files
@@ -70,6 +75,8 @@
 --without imagemagick:  Disable ImageMagick support
 --without directfb:     Disable DirectFB support
 --with    caca:         Enable CACA support
+--with    freetype:     Enable FreeType/Fontconfig support
+--with    antialiasing: Enable font antialiasing (with FreeType/FontConfig)
 
 %description devel
 This package contains development files for xine-lib.
@@ -79,6 +86,7 @@
   - aRts
   - EsounD
   - JACK
+  - Pulseaudio
   - GDK-Pixbuf
   - GNOME VFS
   - SMB
@@ -105,6 +113,7 @@
 %patch2 -p1 -b .CVE-2007-1246
 touch -r m4/optimizations.m4.stamp m4/optimizations.m4
 %patch3 -p0 -b .legacy-flac-init
+%patch4 -p0 -b .ftfree
 # Patch6 needed at least when compiling with external ffmpeg, #939.
 %patch6 -p1 -b .deepbind
 %patch7 -p0 -b .multilib-devel
@@ -136,6 +145,13 @@
 %if 0%{!?_with_caca:1}
     --without-caca \
 %endif
+%if 0%{?_with_freetype:1}
+    --with-freetype \
+    --with-fontconfig \
+%if 0%{?_with_antialiasing:1}
+    --enable-antialiasing \
+%endif
+%endif
     --disable-libfame \
     --disable-faad \
     --disable-mad \
@@ -256,6 +272,7 @@
 %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_arts.so
 %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_esd.so
 %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_jack.so
+%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_pulseaudio.so
 %{_libdir}/xine/plugins/%{version}/xineplug_inp_gnome_vfs.so
 %{_libdir}/xine/plugins/%{version}/xineplug_inp_smb.so
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_sdl.so
@@ -284,8 +301,13 @@
 %{_mandir}/man1/xine-config.1*
 
 
-
 %changelog
+* Mon Mar 26 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.4-4
+- Add PulseAudio support (in -extras, #234035/Jost Diederichs).
+- Adjust Samba build dependencies to work for both <= and > FC6.
+- Add --with freetype and --with antialiasing build time options,
+  default disabled, and an upstream patch for FreeType memory leak (#233194).
+
 * Sat Mar 10 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.4-3
 - Apply upstream fix for CVE-2007-1246.