- rebuild with DirectFB 1.7.2

[packages/gpac.git] / gpac.spec

diff --git a/gpac.spec b/gpac.spec
index 16645e1403400f64fb6aa173a4db095b550f3168..07063e9d78df22cf08e397ecf182498571123651 100644 (file)
--- a/gpac.spec
+++ b/gpac.spec
@@ -6,11 +6,12 @@
 #
 # Conditional build:
 %bcond_with    amr             # AMR-NB and AMR-WB (floating-point) support
+%bcond_without directfb        # DirectFB support
 %bcond_without faad            # AAC decoding support
 %bcond_without ffmpeg          # ffmpeg support
 %bcond_without freetype        # freetype support
 %bcond_without jpeg            # JPEG support
-%bcond_without js              # JavaScript support
+%bcond_with    js              # JavaScript support
 %bcond_without mad             # MP3 support
 %bcond_without png             # PNG support
 %bcond_without xvid            # xvid support
@@ -20,7 +21,7 @@ Summary:      GPAC - an implementation of the MPEG-4 Systems standard (ISO/IEC 14496-
 Summary(pl.UTF-8):     GPAC - implementacja standardu MPEG-4 Systems (ISO/IEC 14496-1)
 Name:          gpac
 Version:       0.5.0
-Release:       1
+Release:       13
 License:       LGPL v2+
 Group:         Applications/Multimedia
 Source0:       http://downloads.sourceforge.net/gpac/%{name}-%{version}.tar.gz
@@ -34,9 +35,11 @@ Patch5:              %{name}-idl_uuid.patch
 Patch6:                %{name}-js.patch
 Patch7:                %{name}-apps.patch
 Patch8:                %{name}-export.patch
+Patch9:                %{name}-ffmpeg2.patch
+Patch10:       wxWidgets3.patch
 URL:           http://gpac.sourceforge.net/
-BuildRequires: DirectFB-devel
-BuildRequires: OpenGL-devel
+%{?with_directfb:BuildRequires:        DirectFB-devel}
+BuildRequires: OpenGL-GLU-devel
 BuildRequires: SDL-devel
 BuildRequires: a52dec-libs-devel
 BuildRequires: alsa-lib-devel >= 0.9
@@ -45,6 +48,7 @@ BuildRequires:        alsa-lib-devel >= 0.9
 %{?with_faad:BuildRequires:    faad2-devel}
 %{?with_ffmpeg:BuildRequires:  ffmpeg-devel >= 0.6}
 %{?with_freetype:BuildRequires:        freetype-devel}
+%{?with_wx:BuildRequires:      gtk+2-devel >= 2:2.20.1}
 BuildRequires: jack-audio-connection-kit-devel
 %{?with_js:BuildRequires:      js-devel < 2:1.8.5}
 %{?with_jpeg:BuildRequires:    libjpeg-devel}
@@ -56,6 +60,7 @@ BuildRequires:        libvorbis-devel
 BuildRequires: libxml2-devel
 BuildRequires: openjpeg-devel
 BuildRequires: openssl-devel
+BuildRequires: pkgconfig
 BuildRequires: pulseaudio-devel
 BuildRequires: rpmbuild(macros) >= 1.357
 BuildRequires: sed >= 4.0
@@ -160,6 +165,8 @@ Wtyczka GPAC dla przeglądarek WWW zgodnych z Netscape.
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p0
+%patch10 -p1
 
 sed -i -e 's/wx-config/wx-gtk2-unicode-config/' configure
 chmod a+x configure
@@ -191,16 +198,18 @@ chmod a+x configure
        %{!?with_xvid:--use-xvid=no} \
        --xulsdk-path="/usr/include/xulrunner -I/usr/include/nspr"
 
+%{!?with_directfb: sed -i 's/CONFIG_DIRECTFB.*/CONFIG_DIRECTFB=no/' config.mak}
+
 %{__make} -j1
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_pkgconfigdir}
 
-%{__make} install install-lib \
+%{__make} -j1 install install-lib \
        DESTDIR=$RPM_BUILD_ROOT
 
-%{__make} -C applications install \
+%{__make} -j1 -C applications install \
        DESTDIR=$RPM_BUILD_ROOT \
        MOZILLA_DIR=$RPM_BUILD_ROOT%{_browserpluginsdir}