rpms
/
gpac
21
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to todays snapshot

Browse Source
el8
Nicolas Chauvet 13 years ago
parent d2c376b5b8
commit ca2cb4df99
7 changed files with 40 additions and 97 deletions
Show Stats Download Patch File Download Diff File

2
.gitignore vendored
Unescape View File

@ -1 +1 @@
gpac-20110923.tar.bz2
gpac-20120623.tar.bz2

13
gpac-0.4.6-js_cflags.patch
Unescape View File

@ -1,13 +0,0 @@
diff -up gpac/configure.js gpac/configure
diff -up gpac/src/Makefile.js gpac/src/Makefile
--- gpac/src/Makefile.js 2009-09-01 16:23:44.053745967 +0200
+++ gpac/src/Makefile 2009-09-01 16:47:32.491499125 +0200
@@ -76,7 +76,7 @@ endif
#3 - spidermonkey support
ifeq ($(CONFIG_JS),no)
else
-SCENEGRAPH_CFLAGS+=$(JS_FLAGS)
+CFLAGS+=$(JS_FLAGS)
ifeq ($(CONFIG_JS),local)
NEED_LOCAL_LIB="yes"
endif

53
gpac-0.4.6_15-soname.patch
Unescape View File

@ -1,53 +0,0 @@
diff -up gpac/src/Makefile.soname gpac/src/Makefile
--- gpac/src/Makefile.soname 2011-07-01 17:38:17.000000000 +0200
+++ gpac/src/Makefile 2011-10-03 22:25:32.362122207 +0200
@@ -158,17 +158,19 @@ endif
##libgpac library output
-LIB=libgpac.$(DYN_LIB_SUFFIX)
+LIBGPAC=libgpac.$(DYN_LIB_SUFFIX)
+LIBGPAC_SOVERSION=".0"
+LIBGPAC_SONAME=$(LIBGPAC)$(LIBGPAC_SOVERSION)
ifeq ($(CONFIG_WIN32),yes)
#LDFLAGS+=-export-symbols libgpac.def
else
ifeq ($(CONFIG_DARWIN),yes)
-LDFLAGS+=-install_name $(prefix)/lib/$(LIB)
+LDFLAGS+=-install_name $(prefix)/lib/$(LIBGPAC)
endif
EXTRALIBS+=$(GPAC_SH_FLAGS)
endif
-LD_SONAME="-Wl,-soname,$(LIB)"
+LD_SONAME="-Wl,-soname,$(LIBGPAC_SONAME)"
ifeq ($(CONFIG_DARWIN), yes)
LD_SONAME=
endif
@@ -181,7 +183,7 @@ SRCS := $(OBJS:.o=.c)
all: lib
-lib: $(LIB)
+lib: $(LIBGPAC)
#there's a bunch of warnings in there, get rid of them
mcrypt: CFLAGS= $(OPTFLAGS) -w -I"$(SRC_PATH)/include"
@@ -200,7 +202,7 @@ compositor: $(LIBGPAC_COMPOSITOR)
$(CC) $(CFLAGS) -c -o $@ $<
-$(LIB): $(LIBGPAC_UTILS) $(LIBGPAC_IETF) $(LIBGPAC_BIFS) $(LIBGPAC_ODF) $(LIBGPAC_LASER) $(LIBGPAC_ISOM) $(LIBGPAC_SCENEMANAGER) $(LIBGPAC_TERMINAL) compositor scenegraph mediatools mcrypt $(OBJS)
+$(LIBGPAC): $(LIBGPAC_UTILS) $(LIBGPAC_IETF) $(LIBGPAC_BIFS) $(LIBGPAC_ODF) $(LIBGPAC_LASER) $(LIBGPAC_ISOM) $(LIBGPAC_SCENEMANAGER) $(LIBGPAC_TERMINAL) compositor scenegraph mediatools mcrypt $(OBJS)
ifeq ($(CONFIG_DARWIN),yes)
libtool -s -o ../bin/gcc/libgpac_static.a $(OBJS)
ranlib ../bin/gcc/libgpac_static.a
@@ -218,7 +220,7 @@ depend:
$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
clean:
- rm -f $(OBJS) ../bin/gcc/$(LIB)
+ rm -f $(OBJS) ../bin/gcc/$(LIBGPAC)
rm -rf ../bin/gcc/libgpac_static.a
distclean: clean

12
gpac-0.5.0-libdir.patch
Unescape View File

@ -0,0 +1,12 @@
diff -up gpac/configure.libdir gpac/configure
--- gpac/configure.libdir 2012-06-23 17:35:19.000000000 +0200
+++ gpac/configure 2012-06-23 19:12:16.815152617 +0200
@@ -2932,7 +2932,7 @@ echo ' $(CC) $(CFLAGS) $(PIC_CFLAGS) -c
#pkg-config
echo "prefix=$prefix" > gpac.pc
echo "exec_prefix=\${prefix}" >> gpac.pc
-echo "libdir=\${exec_prefix}/lib" >> gpac.pc
+echo "libdir=\${exec_prefix}/$libdir" >> gpac.pc
echo "includedir=\${exec_prefix}/include" >> gpac.pc
echo "" >> gpac.pc
echo "Name: gpac" >> gpac.pc

2
gpac-snapshot.sh
Unescape View File

@ -18,7 +18,7 @@ cd "$tmp"
svn co http://gpac.svn.sourceforge.net/svnroot/gpac/trunk/gpac gpac
revision=$(svnversion gpac)
echo "#define GPAC_SVN_REVISION \"$revision\"" > gpac/include/gpac/version.h
find gpac -name '.svn' -type d -exec rm -rf {} ';'
find gpac -name '.svn' -type d -exec rm -rf {} ';' || :
rm -rf gpac/extra_lib/
tar jcf "$pwd"/gpac-$svn.tar.bz2 gpac
cd - >/dev/null

53
gpac.spec
Unescape View File

@ -7,7 +7,7 @@
# - Fix unused-direct-shlib-dependency on libgpac
%global osmo Osmo4
%global svn 20110923
%global svn 20120623
# Mozilla stuff fails. It's completely disabled for now.
%global mozver 3.0
%global geckover 2.0.0
@ -16,17 +16,15 @@
Name: gpac
Summary: MPEG-4 multimedia framework
Version: 0.4.6
Release: 0.19.svn%{?svn}%{?dist}
Version: 0.5.0
Release: 1.svn%{?svn}%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
URL: http://gpac.sourceforge.net/
#Source0: http://downloads.sourceforge.net/gpac/gpac-%{version}.tar.gz
Source0: http://rpms.kwizart.net/fedora/SOURCE/gpac-%{svn}.tar.bz2
Source9: gpac-snapshot.sh
Patch1: gpac-0.4.6_15-soname.patch
Patch1: gpac-0.5.0-libdir.patch
Patch2: gpac-0.4.5-amr.patch
Patch5: gpac-0.4.6-js_cflags.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
BuildRequires: ImageMagick
@ -45,7 +43,7 @@ BuildRequires: ffmpeg-devel
BuildRequires: js-devel
BuildRequires: libxml2-devel
BuildRequires: openssl-devel
#BuildRequires: openjpeg-devel
BuildRequires: openjpeg-devel
BuildRequires: pulseaudio-libs-devel
BuildRequires: zlib-devel
BuildRequires: libogg-devel libvorbis-devel libtheora-devel
@ -142,14 +140,8 @@ web browsers.
%prep
%setup -q -n gpac
%patch1 -p1 -b .soname
%patch1 -p1 -b .libdir
%patch2 -p1 -b .amr
%patch5 -p1 -b .jscflags
## kwizart - enable dynamic mode - hardcoded with patch2
# define SONAME number from the first number of gpac version.
#define soname libgpac.so.0
#sed -i.soname -e 's|EXTRALIBS+=$(GPAC_SH_FLAGS)|EXTRALIBS+=$(GPAC_SH_FLAGS)\nLDFLAGS+="-Wl,-soname,%{soname}"|' src/Makefile
# Fix encoding warnings
cp -p Changelog Changelog.origine
@ -166,12 +158,17 @@ rm -rf doc/ipmpx_syntax.bt.origine
%build
%configure \
--enable-debug \
--X11-path=%{_prefix} \
--extra-cflags="$RPM_OPT_FLAGS -fPIC -DPIC -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -D_GNU_SOURCE=1" \
--X11-path=%{_prefix} \
--libdir=%{_lib} \
--disable-oss-audio \
%{?_with_mozilla:--mozdir=%{_libdir}/mozilla/plugins} \
%{?_with_amr:--enable-amr} \
--disable-static
--disable-static \
--use-js=no
#Avoid mess with setup.h
cp -p config.h include/gpac
##
## Osmo-zila plugin.
@ -252,17 +249,9 @@ install -pm 0644 applications/osmo4_wx/osmo4.xpm $RPM_BUILD_ROOT%{_datadir}/pixm
rm -rf $RPM_BUILD_ROOT%{_bindir}/%{osmo}
}
#hack
%if %{_lib} == "lib64"
mv $RPM_BUILD_ROOT%{_prefix}/lib $RPM_BUILD_ROOT%{_libdir}
%endif
## kwizart - rpmlint gpac no-ldconfig-symlink
ln -sf libgpac.so.%{version}-DEV $RPM_BUILD_ROOT%{_libdir}/libgpac.so.0
ln -sf libgpac.so.0 $RPM_BUILD_ROOT%{_libdir}/libgpac.so
#Install generated sggen binaries
for b in MPEG4 SVG X3D; do
#for b in MPEG4 SVG X3D; do
for b in MPEG4 X3D; do
pushd applications/generators/${b}
install -pm 0755 ${b}Gen $RPM_BUILD_ROOT%{_bindir}
popd
@ -272,7 +261,12 @@ done
touch -r Changelog doc/html/*
#config.h like but not only
touch -r Changelog $RPM_BUILD_ROOT%{_includedir}/gpac/configuration.h
#Usual multilib bug https://bugzilla.rpmfusion.org/show_bug.cgi?id=270
sed -i -e '/GPAC_CONFIGURATION/d' $RPM_BUILD_ROOT%{_includedir}/gpac/configuration.h
touch -r Changelog $RPM_BUILD_ROOT%{_includedir}/gpac/*.h
touch -r Changelog $RPM_BUILD_ROOT%{_includedir}/gpac/internal/*.h
touch -r Changelog $RPM_BUILD_ROOT%{_includedir}/gpac/modules/*.h
rm $RPM_BUILD_ROOT%{_includedir}/gpac/config.h
%clean
@ -289,7 +283,7 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/MP4Box
%{_bindir}/MP4Client
%{_bindir}/MPEG4Gen
%{_bindir}/SVGGen
#{_bindir}/SVGGen
%{_bindir}/X3DGen
%{_datadir}/gpac/
%{_mandir}/man1/*.1.*
@ -331,6 +325,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Sat Jun 23 2012 Nicolas Chauvet <kwizart@gmail.com> - 0.5.0-1.svn20120623
- Update to 0.5.0 svn20120623
* Wed Feb 22 2012 Nicolas Chauvet <kwizart@gmail.com> - 0.4.6-0.19.svn20110923
- Rebuilt for x264/FFmpeg

2
sources
Unescape View File

@ -1 +1 @@
32a1c81119b123d442fa7295d8b77d09 gpac-20110923.tar.bz2
9da24aae5a5d38059a1481848c7f1dea gpac-20120623.tar.bz2

Write Preview
Loading…
Cancel
Save