Author: qboosh Date: Mon Mar 28 17:39:54 2011 GMT Module: packages Tag: HEAD ---- Log message: - dropped outdated wxWidgets patch, use sed call to set wx-config path; enabled by default, packaged in -gui - updated amr: use floating-point implementation in system amrnb/amrwb libraries; added amr patch
---- Files affected: packages/gpac: gpac.spec (1.29 -> 1.30) , gpac-amr.patch (NONE -> 1.1) (NEW), gpac-wxWidgets.patch (1.2 -> NONE) (REMOVED) ---- Diffs: ================================================================ Index: packages/gpac/gpac.spec diff -u packages/gpac/gpac.spec:1.29 packages/gpac/gpac.spec:1.30 --- packages/gpac/gpac.spec:1.29 Sun Mar 20 14:40:46 2011 +++ packages/gpac/gpac.spec Mon Mar 28 19:39:49 2011 @@ -1,11 +1,9 @@ # $Revision$, $Date$ # TODO -# - amr-nb/amr-wb/amr-nb-fixed ? # - FFMPEG: local -# - which: no wx-config in ... # # Conditional build: -%bcond_with amr # AMR-NB support +%bcond_with amr # AMR-NB and AMR-WB (floating-point) support %bcond_without faad # AAC decoding support %bcond_without ffmpeg # ffmpeg support %bcond_without freetype # freetype support @@ -14,28 +12,28 @@ %bcond_without mad # MP3 support %bcond_without png # PNG support %bcond_without xvid # xvid support -%bcond_with wx # wxWidgets support +%bcond_without wx # wxWidgets support # Summary: GPAC - an implementation of the MPEG-4 Systems standard (ISO/IEC 14496-1) Summary(pl.UTF-8): GPAC - implementacja standardu MPEG-4 Systems (ISO/IEC 14496-1) Name: gpac Version: 0.4.5 -Release: 0.1 +Release: 0.2 License: LGPL v2+ Group: Applications/Multimedia Source0: http://downloads.sourceforge.net/gpac/%{name}-%{version}.tar.gz # Source0-md5: 755e8c438a48ebdb13525dd491f5b0d1 -Source1: http://www.3gpp.org/ftp/Specs/archive/26_series/26.073/26073-530.zip -# Source1-md5: 705f6993fbf890e92eb7a331e7c716d1 Patch0: %{name}-install.patch -Patch1: %{name}-wxWidgets.patch -Patch2: %{name}-libpng.patch -Patch3: %{name}-pic.patch -Patch4: %{name}-xulrunner.patch +Patch1: %{name}-libpng.patch +Patch2: %{name}-pic.patch +Patch3: %{name}-xulrunner.patch +Patch4: %{name}-amr.patch URL: http://gpac.sourceforge.net/ BuildRequires: SDL-devel BuildRequires: a52dec-libs-devel BuildRequires: alsa-lib-devel >= 0.9 +%{?with_amr:BuildRequires: amrnb-devel} +%{?with_amr:BuildRequires: amrwb-devel} %{?with_faad:BuildRequires: faad2-devel} %{?with_ffmpeg:BuildRequires: ffmpeg-devel} %{?with_freetype:BuildRequires: freetype-devel} @@ -51,8 +49,9 @@ BuildRequires: openjpeg-devel BuildRequires: pulseaudio-devel BuildRequires: rpmbuild(macros) >= 1.357 +BuildRequires: sed >= 4.0 BuildRequires: unzip -%{?with_wx:BuildRequires: wxGTK2-devel >= 2.5.4} +%{?with_wx:BuildRequires: wxGTK2-devel >= 2.6.0} # -server BuildRequires: xmlrpc-c-devel BuildRequires: xorg-lib-libXext-devel @@ -91,6 +90,18 @@ Projekt docelowo dostarczy odtwarzacz(e), kodery systemowe i narzędzia do publikacji w celu dystrybucji materiałów. +%package gui +Summary: wxWidgets-based GUI for GPAC +Summary(pl.UTF-8): Oparty na wxWidgets graficzny interfejs do GPAC +Group: X11/Applications/Multimedia +Requires: %{name} = %{version}-%{release} + +%description gui +Osmo4 - wxWidgets-based GUI for GPAC. + +%description gui -l pl.UTF-8 +Osmo4 - oparty na wxWidgets graficzny interfejs do GPAC. + %package -n browser-plugin-%{name} Summary: GPAC browser plugin Summary(pl.UTF-8): Wtyczka GPAC do przegląderek WWW @@ -108,18 +119,15 @@ %prep %setup -q -n %{name} %patch0 -p1 -%{?with_wx:%patch1 -p1} +%patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 %if %{with amr} -mkdir -p Plugins/amr_dec/AMR_NB -cd Plugins/amr_dec/AMR_NB -unzip -j %{SOURCE1} -unzip -j 26073-530_ANSI_C_source_code.zip -cd ../../.. +sed -i -e 's/amr_\([nw]b\)_ft/amr\1/' modules/amr_float_dec/amr_float_dec.c %endif +sed -i -e 's/wx-config/wx-gtk2-unicode-config/' configure chmod a+x configure %build @@ -132,7 +140,8 @@ --X11-path=/usr \ --cc="%{__cc}" \ --disable-opt \ - %{?with_amr:--enable-amr-nb} \ + %{!?with_wx:--disable-wx} \ + %{?with_amr:--enable-amr} \ --enable-joystick \ --enable-pic \ --extra-cflags="%{rpmcflags}" \ @@ -187,6 +196,10 @@ %{_mandir}/man1/mp4box.1* %{_mandir}/man1/mp4client.1* +%files gui +%defattr(644,root,root,755) +%attr(755,root,root) %{_bindir}/Osmo4 + %files -n browser-plugin-%{name} %defattr(644,root,root,755) %attr(755,root,root) %{_browserpluginsdir}/nposmozilla.so @@ -198,6 +211,12 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.30 2011/03/28 17:39:49 qboosh +- dropped outdated wxWidgets patch, use sed call to set wx-config path; + enabled by default, packaged in -gui +- updated amr: use floating-point implementation in system amrnb/amrwb libraries; + added amr patch + Revision 1.29 2011/03/20 13:40:46 qboosh - up to 0.4.5 - updated install patch ================================================================ Index: packages/gpac/gpac-amr.patch diff -u /dev/null packages/gpac/gpac-amr.patch:1.1 --- /dev/null Mon Mar 28 19:39:54 2011 +++ packages/gpac/gpac-amr.patch Mon Mar 28 19:39:49 2011 @@ -0,0 +1,35 @@ +--- gpac/modules/amr_float_dec/Makefile.orig 2007-08-28 14:51:20.000000000 +0200 ++++ gpac/modules/amr_float_dec/Makefile 2011-03-27 21:37:20.585733920 +0200 +@@ -18,19 +18,19 @@ + #common obj + OBJS=../amr_dec/amr_in.o amr_float_dec.o + ++AMR_LIBS= ++ + #AMR NB obj + CFLAGS+=-DGPAC_HAS_AMR_FT + ifeq ($(CONFIG_AMR_NB_FT), yes) +-OBJS+=./amr_nb_ft/interf_dec.o ./amr_nb_ft/interf_enc.o ./amr_nb_ft/sp_dec.o ./amr_nb_ft/sp_enc.o ++AMR_LIBS=-lamrnb + endif + + + #AMR WB obj + CFLAGS+=-DGPAC_HAS_AMR_FT_WB + ifeq ($(CONFIG_AMR_WB_FT), yes) +-OBJS+=./amr_wb_ft/dec_acelp.o ./amr_wb_ft/dec_dtx.o ./amr_wb_ft/dec_gain.o ./amr_wb_ft/dec_if.o ./amr_wb_ft/dec_lpc.o ./amr_wb_ft/dec_main.o \ +- ./amr_wb_ft/dec_rom.o ./amr_wb_ft/dec_util.o ./amr_wb_ft/enc_acelp.o ./amr_wb_ft/enc_dtx.o ./amr_wb_ft/enc_gain.o ./amr_wb_ft/enc_if.o \ +- ./amr_wb_ft/enc_lpc.o ./amr_wb_ft/enc_main.o ./amr_wb_ft/enc_rom.o ./amr_wb_ft/enc_util.o ./amr_wb_ft/if_rom.o ++AMR_LIBS=-lamrwb + endif + + +@@ -51,7 +51,7 @@ + + + $(LIB): $(OBJSPIC) +- $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac ++ $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac $(AMR_LIBS) + + + %.o: %.c ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gpac/gpac.spec?r1=1.29&r2=1.30&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
