rpms/wl-kmod/F-10 broadcom-wl-5.10.27.14-linux-2.6.29.patch, NONE, 1.1 wl-kmod.spec, 1.17, 1.18
by Chris Nolan
Author: cnolan
Update of /cvs/nonfree/rpms/wl-kmod/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv13086
Modified Files:
wl-kmod.spec
Added Files:
broadcom-wl-5.10.27.14-linux-2.6.29.patch
Log Message:
* Mon Feb 23 2009 Chris Nolan <chris(a)cenolan.com> - 5.10.27.14-2
- added patch for building against 2.6.29 kernel
broadcom-wl-5.10.27.14-linux-2.6.29.patch:
--- NEW FILE broadcom-wl-5.10.27.14-linux-2.6.29.patch ---
diff -u -r a/src/wl/sys/wl_iw.c b/src/wl/sys/wl_iw.c
--- a/src/wl/sys/wl_iw.c 2009-01-19 23:02:56.000000000 +0100
+++ b/src/wl/sys/wl_iw.c 2009-01-24 12:33:59.810703840 +0100
@@ -610,7 +610,11 @@
char *extra
)
{
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+ wl_iw_t *iw = netdev_priv(dev);
+#else
wl_iw_t *iw = dev->priv;
+#endif
struct sockaddr *addr = (struct sockaddr *) extra;
int i;
@@ -635,7 +639,11 @@
char *extra
)
{
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+ wl_iw_t *iw = netdev_priv(dev);
+#else
wl_iw_t *iw = dev->priv;
+#endif
struct sockaddr *addr = (struct sockaddr *) extra;
struct iw_quality *qual = (struct iw_quality *) &addr[iw->spy_num];
int i;
@@ -1111,7 +1119,11 @@
char *extra
)
{
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+ wl_iw_t *iw = netdev_priv(dev);
+#else
wl_iw_t *iw = dev->priv;
+#endif
WL_TRACE(("%s: SIOCSIWNICKN\n", dev->name));
@@ -1135,7 +1147,11 @@
char *extra
)
{
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+ wl_iw_t *iw = netdev_priv(dev);
+#else
wl_iw_t *iw = dev->priv;
+#endif
WL_TRACE(("%s: SIOCGIWNICKN\n", dev->name));
@@ -1795,7 +1811,11 @@
int paramid;
int paramval;
int val = 0;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+ wl_iw_t *iw = netdev_priv(dev);
+#else
wl_iw_t *iw = dev->priv;
+#endif
WL_TRACE(("%s: SIOCSIWAUTH\n", dev->name));
@@ -1926,7 +1946,11 @@
int paramid;
int paramval = 0;
int val;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+ wl_iw_t *iw = netdev_priv(dev);
+#else
wl_iw_t *iw = dev->priv;
+#endif
WL_TRACE(("%s: SIOCGIWAUTH\n", dev->name));
diff -u -r a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c
--- a/src/wl/sys/wl_linux.c 2009-01-19 23:03:09.000000000 +0100
+++ b/src/wl/sys/wl_linux.c 2009-01-24 13:55:13.397012940 +0100
@@ -53,6 +53,9 @@
#include <linux/pci_ids.h>
#define WLC_MAXBSSCFG 1
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+#include <net/lib80211.h>
+#endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14)
#include <net/ieee80211.h>
#endif
@@ -149,7 +152,11 @@
bool resched;
uint32 pci_psstate[16];
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+ struct lib80211_crypto_ops *tkipmodops;
+#else
struct ieee80211_crypto_ops *tkipmodops;
+#endif
struct ieee80211_tkip_data *tkip_ucast_data;
struct ieee80211_tkip_data *tkip_bcast_data;
#endif
@@ -190,7 +197,11 @@
static int wl_found = 0;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+#define WL_DEV_IF(dev) ((wl_if_t*)netdev_priv(dev))
+#else
#define WL_DEV_IF(dev) ((wl_if_t*)(dev)->priv)
+#endif
#define WL_INFO(dev) ((wl_info_t*)(WL_DEV_IF(dev)->wl))
#define WL_LOCK(wl) spin_lock_bh(&(wl)->lock)
@@ -350,6 +361,9 @@
dev = wlif->dev;
wl->dev = dev;
wl_if_setup(dev);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+ wlif = netdev_priv(dev);
+#endif
dev->base_addr = regs;
@@ -423,10 +437,19 @@
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+ wl->tkipmodops = lib80211_get_crypto_ops("TKIP");
+#else
wl->tkipmodops = ieee80211_get_crypto_ops("TKIP");
+#endif
if (wl->tkipmodops == NULL) {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+ request_module("lib80211");
+ wl->tkipmodops = lib80211_get_crypto_ops("TKIP");
+#else
request_module("ieee80211_crypt_tkip");
wl->tkipmodops = ieee80211_get_crypto_ops("TKIP");
+#endif
}
#endif
#ifdef CONFIG_WIRELESS_EXT
@@ -725,7 +748,11 @@
}
if (wl->monitor) {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+ wl_free_if(wl, (wl_if_t *)netdev_priv(wl->monitor));
+#else
wl_free_if(wl, (wl_if_t *)(wl->monitor->priv));
+#endif
wl->monitor = NULL;
}
@@ -895,6 +922,9 @@
#else
dev = alloc_netdev(0, name, ether_setup);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+ wlif = netdev_priv(dev);
+#endif
if (!dev) {
MFREE(wl->osh, wlif, sizeof(wl_if_t));
WL_ERROR(("wl%d: wl_alloc_if: out of memory, alloc_netdev\n",
@@ -908,7 +938,9 @@
wlif->wl = wl;
wlif->wlcif = wlcif;
wlif->subunit = subunit;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
dev->priv = wlif;
+#endif
if (iftype != WL_IFTYPE_MON && wl->dev && netif_queue_stopped(wl->dev))
netif_stop_queue(dev);
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-10/wl-kmod.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- wl-kmod.spec 13 Feb 2009 06:17:50 -0000 1.17
+++ wl-kmod.spec 23 Feb 2009 20:15:48 -0000 1.18
@@ -3,11 +3,11 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%define buildforkernels newest
+#define buildforkernels newest
Name: wl-kmod
Version: 5.10.27.14
-Release: 1%{?dist}.2
+Release: 2%{?dist}
Summary: Kernel module for broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -15,6 +15,7 @@
Source0: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86_32-v5_10_27_14....
Source1: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86_64-v5_10_27_14....
Source11: broadcom-wl-kmodtool-excludekernel-filterfile
+Patch0: broadcom-wl-5.10.27.14-linux-2.6.29.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: %{_bindir}/kmodtool
@@ -51,6 +52,7 @@
%else
tar xzf %{SOURCE1}
%endif
+%patch0 -p1 -b .kernelfix
popd
for kernel_version in %{?kernel_versions} ; do
@@ -80,6 +82,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Feb 23 2009 Chris Nolan <chris(a)cenolan.com> - 5.10.27.14-2
+- added patch for building against 2.6.29 kernel
+
* Fri Feb 13 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.27.14-1.2
- rebuild for latest Fedora kernel;
15 years, 2 months
rpms/h264enc/devel h264enc.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Conrad Meyer
Author: konradm
Update of /cvs/free/rpms/h264enc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv7726/devel
Modified Files:
.cvsignore sources
Added Files:
h264enc.spec
Log Message:
Import.
--- NEW FILE h264enc.spec ---
Name: h264enc
Version: 8.7.2
Release: 1%{?dist}
Summary: An interactive menu-driven frontend for mencoder
Group: Applications/Multimedia
License: GPLv2+
URL: http://h264enc.sourceforge.net/
Source0: http://internap.dl.sourceforge.net/sourceforge/h264enc/h264enc-%{version}...
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: mencoder
BuildArch: noarch
%description
h264enc is an advanced and powerful interactive menu-driven shell
script written for the GNU/Linux operating system which can help you
to encode a DVD, a video file, a directory with video files or a (S)VCD
to the H.264/MPEG-4 Part 10/AVC video format using the MEncoder encoder
from the MPlayer project and the libx264 library. It supports muxing
the final encode from AVI to Matroska, from AVI to OGM, from AVI to TS
and from AVI to the MP4 container.
%prep
%setup -q
sed -i -e "s|^PREFIX=.*$||" \
-e "s|^DOCDIR=.*$|DOCDIR=./installed-docs|" \
-e 's|^MANDIR=.*$|MANDIR=$PREFIX/share/man/man1|' \
./install
sed -i -e "s|\r$||" matrices/eqm_avc_hr_matrix
sed -i -e "s|/usr/local|%{_prefix}|" doc/README.matrices
%build
# Entire program is shell script, no compilation needed
%install
rm -rf $RPM_BUILD_ROOT
PREFIX="$RPM_BUILD_ROOT%{_prefix}" ./install
rm ./installed-docs/uninstall
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc ./installed-docs/*
%{_bindir}/h264enc
%{_mandir}/man1/h264enc.1*
%changelog
* Sun Feb 22 2009 Conrad Meyer <konrad(a)tylerc.org> - 8.7.2-1
- Fix license, sed /usr/local to prefix.
- Bump to 8.7.2.
* Mon Feb 2 2009 Conrad Meyer <konrad(a)tylerc.org> - 8.7.0-1
- Initial package.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/h264enc/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 23 Feb 2009 18:32:02 -0000 1.1
+++ .cvsignore 23 Feb 2009 18:46:47 -0000 1.2
@@ -0,0 +1 @@
+h264enc-8.7.2.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/h264enc/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 23 Feb 2009 18:32:02 -0000 1.1
+++ sources 23 Feb 2009 18:46:47 -0000 1.2
@@ -0,0 +1 @@
+68a09bbe21a91ce7235b40c397b67fd7 h264enc-8.7.2.tar.gz
15 years, 2 months
rpms/h264enc/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/h264enc/devel
In directory se02.es.rpmfusion.net:/home/rpmfusion/thl/free/owners/tmpcvsUg7228/rpms/h264enc/devel
Added Files:
.cvsignore Makefile sources
Log Message:
Setup of module h264enc
--- NEW FILE .cvsignore ---
--- NEW FILE Makefile ---
# Makefile for source rpm: h264enc
# $Id: Makefile,v 1.1 2009/02/23 18:32:02 thl Exp $
NAME := h264enc
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif
include $(MAKEFILE_COMMON)
--- NEW FILE sources ---
15 years, 2 months
rpms/h264enc Makefile, NONE, 1.1 import.log, NONE, 1.1 pkg.acl, NONE, 1.1
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/h264enc
In directory se02.es.rpmfusion.net:/home/rpmfusion/thl/free/owners/tmpcvsUg7228/rpms/h264enc
Added Files:
Makefile import.log pkg.acl
Log Message:
Setup of module h264enc
--- NEW FILE Makefile ---
# Top level Makefile for module h264enc
all : CVS/Root common-update
@cvs update
common-update : common
@cd common && cvs update
common : CVS/Root
@cvs checkout common
CVS/Root :
@echo "ERROR: This does not look like a CVS checkout" && exit 1
clean :
@find . -type f -name *~ -exec rm -fv {} \;
--- NEW FILE import.log ---
--- NEW FILE pkg.acl ---
15 years, 2 months
rpms/h264enc/devel - New directory
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/h264enc/devel
In directory se02.es.rpmfusion.net:/home/rpmfusion/thl/free/owners/tmpcvsUg7228/rpms/h264enc/devel
Log Message:
Directory /cvs/free/rpms/h264enc/devel added to the repository
15 years, 2 months
rpms/h264enc - New directory
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/h264enc
In directory se02.es.rpmfusion.net:/home/rpmfusion/thl/free/owners/tmpcvsUg7228/rpms/h264enc
Log Message:
Directory /cvs/free/rpms/h264enc added to the repository
15 years, 2 months
rpms/gpac/F-10 gpac-0.4.5-amr.patch, NONE, 1.1 gpac-0.4.5-lib64.patch, NONE, 1.1 gpac-0.4.5-makefix.patch, NONE, 1.1 gpac-0.4.5-soname.patch, NONE, 1.1 gpac-ppc64.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 gpac-0.4.5-libxml2.patch, 1.1, 1.2 gpac.spec, 1.2, 1.3 sources, 1.2, 1.3 gpac-0.4.4-soname.patch, 1.1, NONE gpac-0.4.5-shared_amr.patch, 1.1, NONE gpac-0.4.5-system_libdir.patch, 1.1, NONE gpac-0.4.5-timestramps.patch, 1.1, NONE gpac-20080211cvs-gcc43-gnusource.patch, 1.1, NONE gpac-20080211cvs-no-osmozilla.p
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/gpac/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv23378/F-10
Modified Files:
.cvsignore gpac-0.4.5-libxml2.patch gpac.spec sources
Added Files:
gpac-0.4.5-amr.patch gpac-0.4.5-lib64.patch
gpac-0.4.5-makefix.patch gpac-0.4.5-soname.patch
gpac-ppc64.patch
Removed Files:
gpac-0.4.4-soname.patch gpac-0.4.5-shared_amr.patch
gpac-0.4.5-system_libdir.patch gpac-0.4.5-timestramps.patch
gpac-20080211cvs-gcc43-gnusource.patch
gpac-20080211cvs-no-osmozilla.patch
Log Message:
Update gpac to 0.4.5
gpac-0.4.5-amr.patch:
--- NEW FILE gpac-0.4.5-amr.patch ---
diff -up gpac/modules/amr_dec/amr_dec.c.amr gpac/modules/amr_dec/amr_dec.c
--- gpac/modules/amr_dec/amr_dec.c.amr 2008-12-17 12:33:30.000000000 +0100
+++ gpac/modules/amr_dec/amr_dec.c 2008-12-17 12:33:52.000000000 +0100
@@ -24,8 +24,8 @@
/*include AMR stuff*/
-#include "amr_nb/sp_dec.h"
-#include "amr_nb/d_homing.h"
+#include <amrnb/sp_dec.h>
+#include <amrnb/d_homing.h>
/*remove AMR types to avoid any typedef warning/error*/
#undef Float
#undef Bool
diff -up gpac/modules/amr_dec/Makefile.amr gpac/modules/amr_dec/Makefile
--- gpac/modules/amr_dec/Makefile.amr 2008-12-17 12:33:42.000000000 +0100
+++ gpac/modules/amr_dec/Makefile 2008-12-17 12:33:49.000000000 +0100
@@ -17,31 +17,7 @@ LDFLAGS+=-pg
endif
#common obj
-OBJS=amr_in.o amr_dec.o \
- ./amr_nb/agc.o ./amr_nb/autocorr.o ./amr_nb/az_lsp.o ./amr_nb/bits2prm.o ./amr_nb/cl_ltp.o \
- ./amr_nb/convolve.o ./amr_nb/c1035pf.o ./amr_nb/d_plsf.o ./amr_nb/d_plsf_5.o ./amr_nb/d_gain_c.o \
- ./amr_nb/d_gain_p.o ./amr_nb/dec_lag6.o ./amr_nb/d1035pf.o ./amr_nb/cor_h.o ./amr_nb/enc_lag3.o \
- ./amr_nb/enc_lag6.o ./amr_nb/g_code.o ./amr_nb/g_pitch.o ./amr_nb/int_lpc.o ./amr_nb/inter_36.o \
- ./amr_nb/inv_sqrt.o ./amr_nb/lag_wind.o ./amr_nb/levinson.o ./amr_nb/lsp_az.o ./amr_nb/lsp_lsf.o \
- ./amr_nb/ol_ltp.o ./amr_nb/pitch_fr.o ./amr_nb/pitch_ol.o ./amr_nb/pow2.o ./amr_nb/pre_big.o \
- ./amr_nb/pre_proc.o ./amr_nb/pred_lt.o ./amr_nb/preemph.o ./amr_nb/prm2bits.o ./amr_nb/pstfilt.o \
- ./amr_nb/q_gain_c.o ./amr_nb/q_gain_p.o ./amr_nb/q_plsf.o ./amr_nb/q_plsf_5.o ./amr_nb/lsfwt.o \
- ./amr_nb/reorder.o ./amr_nb/residu.o ./amr_nb/lsp.o ./amr_nb/lpc.o ./amr_nb/ec_gains.o \
- ./amr_nb/spreproc.o ./amr_nb/syn_filt.o ./amr_nb/weight_a.o ./amr_nb/qua_gain.o \
- ./amr_nb/gc_pred.o ./amr_nb/q_plsf_3.o ./amr_nb/post_pro.o ./amr_nb/dec_lag3.o ./amr_nb/dec_gain.o \
- ./amr_nb/d_plsf_3.o ./amr_nb/d4_17pf.o ./amr_nb/c4_17pf.o ./amr_nb/d3_14pf.o ./amr_nb/c3_14pf.o \
- ./amr_nb/d2_11pf.o ./amr_nb/c2_11pf.o ./amr_nb/d2_9pf.o ./amr_nb/c2_9pf.o ./amr_nb/cbsearch.o \
- ./amr_nb/spstproc.o ./amr_nb/gain_q.o ./amr_nb/cod_amr.o ./amr_nb/dec_amr.o ./amr_nb/sp_enc.o \
- ./amr_nb/sp_dec.o ./amr_nb/ph_disp.o ./amr_nb/g_adapt.o ./amr_nb/calc_en.o ./amr_nb/qgain795.o \
- ./amr_nb/qgain475.o ./amr_nb/sqrt_l.o ./amr_nb/set_sign.o ./amr_nb/s10_8pf.o ./amr_nb/bgnscd.o \
- ./amr_nb/gmed_n.o ./amr_nb/mac_32.o ./amr_nb/ex_ctrl.o ./amr_nb/c_g_aver.o ./amr_nb/lsp_avg.o \
- ./amr_nb/int_lsf.o ./amr_nb/c8_31pf.o ./amr_nb/d8_31pf.o ./amr_nb/p_ol_wgh.o ./amr_nb/ton_stab.o \
- ./amr_nb/vad1.o ./amr_nb/dtx_enc.o ./amr_nb/dtx_dec.o ./amr_nb/a_refl.o ./amr_nb/b_cn_cod.o \
- ./amr_nb/calc_cor.o ./amr_nb/hp_max.o ./amr_nb/vadname.o ./amr_nb/vad2.o ./amr_nb/r_fft.o \
- ./amr_nb/lflg_upd.o ./amr_nb/e_homing.o ./amr_nb/d_homing.o ./amr_nb/basicop2.o \
- ./amr_nb/count.o ./amr_nb/oper_32b.o ./amr_nb/copy.o ./amr_nb/log2.o \
- ./amr_nb/set_zero.o ./amr_nb/strfunc.o ./amr_nb/n_proc.o ./amr_nb/sid_sync.o
-
+OBJS=amr_in.o amr_dec.o
SRCS := $(OBJS:.o=.c)
@@ -56,11 +32,14 @@ else
OBJSPIC=$(OBJS)
endif
+AMR_NB_LIBS=-lamrnb
+AMR_WB_LIBS=-lamrwb
+
all: $(LIB)
$(LIB): $(OBJS)
- $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac
+ $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(AMR_NB_LIBS) $(AMR_WB_LIBS) $(EXTRALIBS) -L../../bin/gcc -lgpac
%.o: %.c
diff -up gpac/modules/amr_float_dec/amr_float_dec.c.amr gpac/modules/amr_float_dec/amr_float_dec.c
--- gpac/modules/amr_float_dec/amr_float_dec.c.amr 2008-12-17 12:37:26.000000000 +0100
+++ gpac/modules/amr_float_dec/amr_float_dec.c 2008-12-17 12:38:07.000000000 +0100
@@ -31,12 +31,12 @@
#ifdef GPAC_HAS_AMR_FT
/*AMR NB*/
-#include "amr_nb_ft/interf_dec.h"
+#include <amrnb/interf_dec.h>
#endif
#ifdef GPAC_HAS_AMR_FT_WB
/*AMR WB*/
-#include "amr_wb_ft/dec_if.h"
+#include <amrwb/dec_if.h>
#endif
/*default size in CU of composition memory for audio*/
diff -up gpac/modules/amr_float_dec/Makefile.amr gpac/modules/amr_float_dec/Makefile
--- gpac/modules/amr_float_dec/Makefile.amr 2008-12-17 12:34:17.000000000 +0100
+++ gpac/modules/amr_float_dec/Makefile 2008-12-17 12:36:56.000000000 +0100
@@ -21,16 +21,18 @@ OBJS=../amr_dec/amr_in.o amr_float_dec.o
#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
+#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_NB_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
+#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_WB_LIBS=-lamrwb
endif
@@ -51,7 +53,7 @@ all: $(LIB)
$(LIB): $(OBJSPIC)
- $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac
+ $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(AMR_NB_LIBS) $(AMR_WB_LIBS) $(EXTRALIBS) -L../../bin/gcc -lgpac
%.o: %.c
gpac-0.4.5-lib64.patch:
--- NEW FILE gpac-0.4.5-lib64.patch ---
diff -up gpac/configure.lib64 gpac/configure
--- gpac/configure.lib64 2008-12-17 14:25:31.000000000 +0100
+++ gpac/configure 2008-12-17 14:26:24.000000000 +0100
@@ -1126,10 +1126,10 @@ if test "$disable_opengl" = "no" ; then
fi
if $cc -o $TMPO $TMPC $LINK3D 2> /dev/null ; then
has_opengl="yes"
- elif $cc -o $TMPO $TMPC -I$X11_PATH/include -L$X11_PATH/lib 2> /dev/null ; then
+ elif $cc -o $TMPO $TMPC -I$X11_PATH/include -L$X11_PATH/lib64 2> /dev/null ; then
has_opengl="yes"
INCL3D="-I$X11_PATH/include"
- LINK3D="-L$X11_PATH/lib $LINK3D"
+ LINK3D="-L$X11_PATH/lib64 $LINK3D"
fi
if test "$has_opengl" = "no" ; then
LINK3D=""
@@ -1186,7 +1186,7 @@ cat > $TMPC << EOF
#include <X11/Xlib.h>
int main( void ) { return 0; }
EOF
-if $cc -o $TMPO $TMPC -I$X11_PATH/include -L$X11_PATH/lib 2> /dev/null ; then
+if $cc -o $TMPO $TMPC -I$X11_PATH/include -L$X11_PATH/lib64 2> /dev/null ; then
has_x11="yes"
#look for X11 shared memory support
@@ -1198,7 +1198,7 @@ cat > $TMPC << EOF
int main( void ) { return 0; }
EOF
-if $cc -o $TMPO $TMPC -I$X11_PATH/include -L$X11_PATH/lib 2> /dev/null ; then
+if $cc -o $TMPO $TMPC -I$X11_PATH/include -L$X11_PATH/lib64 2> /dev/null ; then
has_x11_shm="yes"
fi
gpac-0.4.5-makefix.patch:
--- NEW FILE gpac-0.4.5-makefix.patch ---
diff -up gpac/Makefile.makefix gpac/Makefile
--- gpac/Makefile.makefix 2008-10-23 17:40:38.000000000 +0200
+++ gpac/Makefile 2008-12-17 12:10:45.000000000 +0100
@@ -53,9 +53,8 @@ install:
install $(INSTFLAGS) -m 755 bin/gcc/MP4Box "$(DESTDIR)$(prefix)/bin"
$(MAKE) -C applications install
install -d "$(DESTDIR)$(moddir)"
- install bin/gcc/*.$(DYN_LIB_SUFFIX) "$(DESTDIR)$(moddir)"
- rm -f $(DESTDIR)$(moddir)/libgpac.$(DYN_LIB_SUFFIX)
- rm -f $(DESTDIR)$(moddir)/nposmozilla.$(DYN_LIB_SUFFIX)
+ install bin/gcc/gm*.$(DYN_LIB_SUFFIX) "$(DESTDIR)$(moddir)"
+
ifeq ($(CONFIG_WIN32),yes)
install $(INSTFLAGS) -m 755 bin/gcc/libgpac.dll $(prefix)/$(libdir)
else
@@ -66,19 +65,18 @@ ifeq ($(CONFIG_DARWIN),yes)
install -m 755 bin/gcc/libgpac.$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/$(libdir)/libgpac-$(VERSION).$(DYN_LIB_SUFFIX)
ln -sf libgpac-$(VERSION).$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/$(libdir)/libgpac.$(DYN_LIB_SUFFIX)
else
- install $(INSTFLAGS) -m 755 bin/gcc/libgpac.$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/$(libdir)/libgpac-$(VERSION).$(DYN_LIB_SUFFIX)
- ln -sf libgpac-$(VERSION).$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/$(libdir)/libgpac.$(DYN_LIB_SUFFIX)
- ldconfig || true
+ install $(INSTFLAGS) -m 755 bin/gcc/libgpac.$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/$(libdir)/libgpac.$(DYN_LIB_SUFFIX).$(VERSION)
+ ln -sf libgpac.$(DYN_LIB_SUFFIX).$(VERSION) $(DESTDIR)$(prefix)/$(libdir)/libgpac.$(DYN_LIB_SUFFIX)
endif
endif
install -d "$(DESTDIR)$(mandir)"
install -d "$(DESTDIR)$(mandir)/man1"
if [ -d doc ] ; then \
- install -m 644 doc/man/mp4box.1 $(DESTDIR)$(mandir)/man1/ ; \
- install -m 644 doc/man/mp4client.1 $(DESTDIR)$(mandir)/man1/ ; \
- install -m 644 doc/man/gpac.1 $(DESTDIR)$(mandir)/man1/ ; \
+ install -pm 644 doc/man/mp4box.1 $(DESTDIR)$(mandir)/man1/ ; \
+ install -pm 644 doc/man/mp4client.1 $(DESTDIR)$(mandir)/man1/ ; \
+ install -pm 644 doc/man/gpac.1 $(DESTDIR)$(mandir)/man1/ ; \
install -d "$(DESTDIR)$(prefix)/share/gpac" ; \
- install -m 644 doc/gpac.mp4 $(DESTDIR)$(prefix)/share/gpac/ ; \
+ install -pm 644 doc/gpac.mp4 $(DESTDIR)$(prefix)/share/gpac/ ; \
fi
uninstall:
@@ -94,17 +92,15 @@ uninstall:
install-lib:
mkdir -p "$(DESTDIR)$(prefix)/include/gpac"
- install -m 644 $(SRC_PATH)/include/gpac/*.h "$(DESTDIR)$(prefix)/include/gpac"
+ install -pm 644 $(SRC_PATH)/include/gpac/*.h "$(DESTDIR)$(prefix)/include/gpac"
mkdir -p "$(DESTDIR)$(prefix)/include/gpac/internal"
- install -m 644 $(SRC_PATH)/include/gpac/internal/*.h "$(DESTDIR)$(prefix)/include/gpac/internal"
+ install -pm 644 $(SRC_PATH)/include/gpac/internal/*.h "$(DESTDIR)$(prefix)/include/gpac/internal"
mkdir -p "$(DESTDIR)$(prefix)/include/gpac/modules"
- install -m 644 $(SRC_PATH)/include/gpac/modules/*.h "$(DESTDIR)$(prefix)/include/gpac/modules"
+ install -pm 644 $(SRC_PATH)/include/gpac/modules/*.h "$(DESTDIR)$(prefix)/include/gpac/modules"
ifeq ($(GPAC_ENST), yes)
mkdir -p "$(DESTDIR)$(prefix)/include/gpac/enst"
- install -m 644 $(SRC_PATH)/include/gpac/enst/*.h "$(DESTDIR)$(prefix)/include/gpac/enst"
+ install -pm 644 $(SRC_PATH)/include/gpac/enst/*.h "$(DESTDIR)$(prefix)/include/gpac/enst"
endif
- mkdir -p "$(DESTDIR)$(prefix)/lib"
- install -m 644 "./bin/gcc/libgpac_static.a" "$(DESTDIR)$(prefix)/lib"
mkdir -p "$(DESTDIR)$(prefix)/$(libdir)"
install -m 644 "./bin/gcc/libgpac_static.a" "$(DESTDIR)$(prefix)/$(libdir)"
gpac-0.4.5-soname.patch:
--- NEW FILE gpac-0.4.5-soname.patch ---
diff -up gpac/src/Makefile.soname gpac/src/Makefile
--- gpac/src/Makefile.soname 2008-12-02 15:01:08.000000000 +0100
+++ gpac/src/Makefile 2008-12-17 11:55:52.000000000 +0100
@@ -171,6 +171,7 @@ ifeq ($(CONFIG_DARWIN),yes)
LDFLAGS+=-install_name $(prefix)/lib/$(LIB)
endif
EXTRALIBS+=$(GPAC_SH_FLAGS)
+LDFLAGS+="-Wl,-soname,libgpac.so.0"
endif
ifeq ($(WANT_PIC),yes)
gpac-ppc64.patch:
--- NEW FILE gpac-ppc64.patch ---
diff -up gpac/configure~ gpac/configure
--- gpac/configure~ 2008-12-17 14:58:05.000000000 +0100
+++ gpac/configure 2008-12-18 23:10:50.000000000 +0100
@@ -236,6 +236,10 @@ case "$cpu" in
alpha)
cpu="alpha"
;;
+ ppc64)
+ cpu="powerpc"
+ libdir="lib64"
+ ;;
"Power Macintosh"|ppc)
cpu="powerpc"
;;
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gpac/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 3 Aug 2008 14:29:51 -0000 1.2
+++ .cvsignore 23 Feb 2009 13:54:36 -0000 1.3
@@ -1 +1 @@
-gpac-20080217.tar.bz2
+gpac-0.4.5-repack.tar.bz2
gpac-0.4.5-libxml2.patch:
Index: gpac-0.4.5-libxml2.patch
===================================================================
RCS file: /cvs/free/rpms/gpac/F-10/gpac-0.4.5-libxml2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gpac-0.4.5-libxml2.patch 3 Aug 2008 14:29:51 -0000 1.1
+++ gpac-0.4.5-libxml2.patch 23 Feb 2009 13:54:36 -0000 1.2
@@ -1,6 +1,6 @@
diff -up gpac/applications/generators/SVG/Makefile.libxml2 gpac/applications/generators/SVG/Makefile
---- gpac/applications/generators/SVG/Makefile.libxml2 2008-02-17 19:12:02.000000000 +0100
-+++ gpac/applications/generators/SVG/Makefile 2008-02-17 19:12:41.000000000 +0100
+--- gpac/applications/generators/SVG/Makefile.libxml2 2008-12-17 12:59:23.000000000 +0100
++++ gpac/applications/generators/SVG/Makefile 2008-12-17 12:59:23.000000000 +0100
@@ -37,7 +37,7 @@ SRCS := $(OBJS:.o=.c)
all: $(PROG)
@@ -11,19 +11,19 @@
%.o: %.c
diff -up gpac/configure.libxml2 gpac/configure
---- gpac/configure.libxml2 2008-02-17 19:13:07.000000000 +0100
-+++ gpac/configure 2008-02-17 20:09:09.000000000 +0100
-@@ -59,6 +59,7 @@ has_oss_audio="no"
- has_alsa="no"
+--- gpac/configure.libxml2 2008-12-17 12:59:23.000000000 +0100
++++ gpac/configure 2008-12-17 13:02:37.000000000 +0100
+@@ -68,6 +68,7 @@ has_alsa="no"
+ has_jack="no"
has_x11="no"
has_x11_shm="no"
+has_libxml2="no"
+ has_x11_xv="no"
disable_svg="no"
no_gcc_opt="no"
- use_fixed_point="no"
-@@ -892,6 +893,15 @@ for opt do
- esac
- done
+@@ -901,6 +902,15 @@ fi
+ fi
+ #end wx test
+# If svg isn't disabled
+if test "$disable_svg" != "yes"; then
@@ -35,17 +35,17 @@
+ fi
+fi
- #look for X11 shared memory support
+ # look for IPv6
cat > $TMPC << EOF
-@@ -1256,6 +1266,11 @@ echo "CONFIG_FFMPEG=$has_ffmpeg" >> conf
- echo "CONFIG_OSS_AUDIO=$has_oss_audio" >> config.mak
- echo "CONFIG_ALSA=$has_alsa" >> config.mak
+@@ -1579,6 +1589,11 @@ echo "CONFIG_JACK=$has_jack" >> config.m
+ echo "CONFIG_A52=$has_a52" >> config.mak
+
echo "DISABLE_SVG=$disable_svg" >> config.mak
+echo "HAS_LIBXML2=$has_libxml2" >> config.mak
+if test "$has_libxml2" = "yes"; then
+ echo "XML2_CFLAGS=$libxml2_cflags" >> config.mak
+ echo "XML2_LIBS=$libxml2_lib_flags" >> config.mak
+fi
- echo "HAS_OPENGL=$has_opengl" >> config.mak
- if test "$has_opengl" = "yes" ; then
- echo "OGL_LIBS=$LINK3D" >> config.mak
+ echo "GPAC_USE_TINYGL=$has_tinygl" >> config.mak
+ echo "OGL_INCLS=$INCL3D" >> config.mak
+ if test "$disable_svg" = "yes" ; then
Index: gpac.spec
===================================================================
RCS file: /cvs/free/rpms/gpac/F-10/gpac.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gpac.spec 8 Sep 2008 16:45:45 -0000 1.2
+++ gpac.spec 23 Feb 2009 13:54:36 -0000 1.3
@@ -7,9 +7,7 @@
# - Fix unused-direct-shlib-dependency on libgpac
%define osmo Osmo4
-%define cvs 20080217
-%define with_amr 0
-%define with_mozilla 0
+#define cvs 20080217
%define with_static 1
%define with_osmo 0
# Mozilla stuff fails. It's completely disabled for now.
@@ -21,26 +19,26 @@
Name: gpac
Summary: MPEG-4 multimedia framework
Version: 0.4.5
-Release: 0.5.%{cvs}cvs%{?dist}
+Release: 3%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
URL: http://gpac.sourceforge.net/
-#Source0: http://downloads.sourceforge.net/gpac/gpac-0.4.4.tar.gz
-Source0: http://rpms.kwizart.net/fedora/SOURCES/gpac-%{cvs}.tar.bz2
-Source10: %{name}-snapshot.sh
-Patch0: gpac-20080211cvs-gcc43-gnusource.patch
-Patch1: gpac-20080211cvs-no-osmozilla.patch
-Patch2: gpac-0.4.4-soname.patch
-Patch3: gpac-0.4.5-system_libdir.patch
+#Source0: http://downloads.sourceforge.net/gpac/gpac-%{version}.tar.gz
+Source0: http://rpms.kwizart.net/fedora/SOURCE/gpac-%{version}-repack.tar.bz2
+Source9: gpac-snapshot.sh
+Patch0: gpac-0.4.5-makefix.patch
+Patch1: gpac-0.4.5-soname.patch
+Patch2: gpac-0.4.5-amr.patch
+Patch3: gpac-0.4.5-lib64.patch
Patch4: gpac-0.4.5-system_openjpeg.patch
-Patch5: gpac-0.4.5-timestramps.patch
Patch6: gpac-0.4.5-shared_sggen.patch
Patch7: gpac-0.4.5-libxml2.patch
-Patch8: gpac-0.4.5-shared_amr.patch
+Patch8: gpac-ppc64.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
BuildRequires: ImageMagick
BuildRequires: SDL-devel
+BuildRequires: a52dec-devel
BuildRequires: librsvg2-devel >= 2.5.0
BuildRequires: libGLU-devel
BuildRequires: freeglut-devel
@@ -54,21 +52,18 @@
BuildRequires: libxml2-devel
BuildRequires: openssl-devel
BuildRequires: openjpeg-devel
+BuildRequires: pulseaudio-libs-devel
BuildRequires: zlib-devel
BuildRequires: libogg-devel libvorbis-devel libtheora-devel
BuildRequires: libXt-devel
BuildRequires: libXpm-devel
+BuildRequires: libXv-devel
BuildRequires: wxGTK-devel
-%if %{with_mozilla}
-BuildRequires: gecko-devel >= %{geckoverver}
-BuildRequires: js-devel
-%endif
+BuildRequires: xmlrpc-c-devel
+%{?_with_mozilla:BuildRequires: gecko-devel}
BuildRequires: doxygen
BuildRequires: desktop-file-utils
-%if %{with_amr}
-BuildRequires: amrnb-devel
-BuildRequires: amrwb-devel
-%endif
+%{?_with_amr:BuildRequires: amrnb-devel amrwb-devel}
%description
GPAC is a multimedia framework based on the MPEG-4 Systems standard developed
@@ -131,7 +126,7 @@
* Frame export to JPG, PNG, BMP.
%endif
-%if %{with_mozilla}
+%{?_with_mozilla:
%package -n mozilla-%{osmo}
Summary: Osmo Media Player plugin for Mozilla compatible web browsers
Group: Applications/Multimedia
@@ -143,47 +138,26 @@
%description -n mozilla-%{osmo}
This package contains the OSMO Media Player plugin for Mozilla compatible
web browsers.
-%endif
+}
%prep
%setup -q -n gpac
-pushd src
-%patch0 -b .patch0
-popd
-pushd applications
-%patch1 -b .patch1
-popd
-%patch2 -p1 -b .soname
-%patch3 -p1 -b .libdir
+%patch0 -p1 -b .makefix
+%patch1 -p1 -b .soname
+%patch2 -p1 -b .amr
+%if %{_lib} == "lib64"
+%patch3 -p1 -b .lib64
+%endif
%patch4 -p1 -b .openjpeg
-%patch5 -p1 -b .timestramps
%patch6 -p1 -b .shared
%patch7 -p1 -b .libxml2
-%patch8 -p1 -b .amr
+%patch8 -p1 -b .ppc64
## 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
-
-## lib64 compatible - hardcoded with patch3
-## kwizart - lib64 compatible - modified
-#sed -i -e 's|lGLU|lGLU -L%{_libdir}|g' configure
-#sed -i -e 's|$(prefix)/lib/gpac|%{_libdir}/gpac|' configure
-#sed -i -e 's|$(prefix)/lib|%{_libdir}|' Makefile
-#sed -i -e 's|$(prefix)/include|%{_includedir}|' Makefile
-#sed -i -e 's|$(prefix)/lib/$(LIB)|%{_libdir}/$(LIB)|' Makefile
-#ifarch x86_64 ia64 ppc64
-#sed -i -e 's|is_64="no"|is_64="yes"|' configure
-#endif
-
-# Fix openjpeg detection and built - hardcoded with patch4
-#sed -i.openjpeg -e 's|openjpeg.h|openjpeg/openjpeg.h|' configure modules/img_in/jp2_dec.c
-
-# Fix compat-wxGTK26 use - seems unneeded but
-# sed -i -e 's|wx-config|wx-2.6-config|' configure
-
# Update doxygen
pushd doc
doxygen -u
@@ -204,25 +178,17 @@
%build
%configure \
--enable-debug \
- --extra-cflags="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1" \
- --libdir=%{_libdir} \
+ --X11-path=%{_prefix} \
+ --extra-cflags="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -D_GNU_SOURCE=1" \
--disable-oss-audio \
-%if %with_mozilla
- --mozdir=%{_libdir}/mozilla/plugins \
-%endif
-%if %{with_amr}
- --enable-amr \
-%endif
+%{?_with_mozilla:--mozdir=%{_libdir}/mozilla/plugins} \
+%{?_with_amr:--enable-amr} \
--disable-static
-# --extra-cflags '-fshort-wchar -I/usr/include/xulrunner-sdk-1.9pre/stable -I/usr/include/nspr4' \
- # ^ pkg-config libxul --cflags
-
-
##
## Osmo-zila plugin.
##
-%if %{with_mozilla}
+%{?_with_mozilla:
#
# Rebuild osmozilla.xpt
pushd applications/osmozilla
@@ -245,7 +211,7 @@
# -I%{_includedir}/firefox-%{mozver}/xpcom \
# -I%{_includedir}/nspr4/ $INCLUDES" \
# install
-%endif
+}
# Parallele build will fail
make all OPTFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC"
@@ -262,12 +228,12 @@
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install install-lib
-%if %{with_mozilla}
+%{?_with_mozilla:
## kwizart - Install osmozilla plugin - make instmoz disabled.
mkdir -p $RPM_BUILD_ROOT%{_libdir}/mozilla/{plugins,components}
install -m 755 bin/gcc/nposmozilla.so $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins/nposmozilla.so
install -m 755 bin/gcc/nposmozilla.xpt $RPM_BUILD_ROOT%{_libdir}/mozilla/components/nposmozilla.xpt
-%endif
+}
%if %{with_osmo}
# Desktop menu Osmo4
@@ -279,13 +245,13 @@
Comment=MPEG-4 Media Player
Exec=%{osmo}
Terminal=false
-Icon=%{osmo}.xpm
+Icon=%{osmo}
Type=Application
Encoding=UTF-8
-Categories=Application;AudioVideo;Player;
+Categories=AudioVideo;Player;
EOF
-desktop-file-install --vendor livna \
+desktop-file-install --vendor "" \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
--mode 644 \
%{osmo}.desktop
@@ -298,13 +264,9 @@
%endif
## kwizart - rpmlint gpac no-ldconfig-symlink
-mv $RPM_BUILD_ROOT%{_libdir}/libgpac-%{version}-DEV.so $RPM_BUILD_ROOT%{_libdir}/libgpac.so.%{version}
ln -sf libgpac.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libgpac.so.0
ln -sf libgpac.so.0 $RPM_BUILD_ROOT%{_libdir}/libgpac.so
-# Don't provide libgpac.so twice
-rm -rf $RPM_BUILD_ROOT%{_libdir}/gpac/libgpac.so
-
#Install generated sggen binaries
for b in MPEG4 SVG X3D; do
pushd applications/generators/${b}
@@ -312,6 +274,9 @@
popd
done
+#Fix doxygen timestamp
+touch -r Changelog doc/html/*
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -343,12 +308,12 @@
%{_datadir}/pixmaps/%{osmo}.xpm
%endif
-%if %{with_mozilla}
+%{?_with_mozilla:
%files -n mozilla-%{osmo}
%defattr(-,root,root)
%{_libdir}/mozilla/plugins/nposmozilla.so
%{_libdir}/mozilla/components/nposmozilla.xpt
-%endif
+}
%files devel
%doc doc/CODING_STYLE doc/ipmpx_syntax.bt
@@ -366,6 +331,19 @@
%endif
%changelog
+* Sun Dec 28 2008 kwizart < kwizart at gmail.com > - 0.4.5-3
+- Fix -devel doc timestamp which leads to multilib conflict
+ ( RPM Fusion #270 )
+
+* Thu Dec 18 2008 kwizart < kwizart at gmail.com > - 0.4.5-2
+- Fix for ppc64
+
+* Wed Dec 17 2008 kwizart < kwizart at gmail.com > - 0.4.5-1
+- Update to 0.4.5 (final)
+- Drop upstreamed patches - Rewrite some
+- Add More BR.
+- Conditionalize --with mozilla amr
+
* Mon Sep 8 2008 kwizart < kwizart at gmail.com > - 0.4.5-0.5.20080217cvs
- Fix for Large File Support (was livna #2075 )
Index: sources
===================================================================
RCS file: /cvs/free/rpms/gpac/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 3 Aug 2008 14:29:51 -0000 1.2
+++ sources 23 Feb 2009 13:54:36 -0000 1.3
@@ -1 +1 @@
-dd56cf8f1ffe3431813ec3954b93b31d gpac-20080217.tar.bz2
+adf9be7956cf35b01dd14bd622e16e86 gpac-0.4.5-repack.tar.bz2
--- gpac-0.4.4-soname.patch DELETED ---
--- gpac-0.4.5-shared_amr.patch DELETED ---
--- gpac-0.4.5-system_libdir.patch DELETED ---
--- gpac-0.4.5-timestramps.patch DELETED ---
--- gpac-20080211cvs-gcc43-gnusource.patch DELETED ---
--- gpac-20080211cvs-no-osmozilla.patch DELETED ---
15 years, 2 months
rpms/mock-rpmfusion-nonfree/F-9 mock-rpmfusion-nonfree.spec, NONE, 1.1 sources, 1.1, 1.2
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/mock-rpmfusion-nonfree/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22060
Modified Files:
sources
Added Files:
mock-rpmfusion-nonfree.spec
Log Message:
Import for F-9
--- NEW FILE mock-rpmfusion-nonfree.spec ---
Name: mock-rpmfusion-nonfree
Version: 10.0
Release: 1%{?dist}
Summary: Mock config files for the RPM Fusion NonFree Repository
Group: Development/Tools
License: BSD
URL: http://rpmfusion.org/
Source0: %{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
Requires: mock
%description
Mock config files for the RPM Fusion NonFree Repository
%prep
%setup -q -c
%build
#Nothing to build
%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/mock
install -pm 0644 *.cfg $RPM_BUILD_ROOT%{_sysconfdir}/mock
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/mock/*_nonfree.cfg
%changelog
* Mon Feb 23 2009 kwizart < kwizart at gmail.com > - 10.0-1
- Bump to 10.0
* Fri Feb 20 2009 kwizart < kwizart at gmail.com > - 0.93-1
- Update to 0.93
- Add need_sign repos (desactivated by default).
- Use the same root as the mother distro.
* Thu Dec 18 2008 kwizart < kwizart at gmail.com > - 0.90-1
- Initial package.
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mock-rpmfusion-nonfree/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 23 Feb 2009 11:30:11 -0000 1.1
+++ sources 23 Feb 2009 13:36:29 -0000 1.2
@@ -0,0 +1 @@
+3e6ef45b0bb313a9a8aa85124717ed78 mock-rpmfusion-nonfree-10.0.tar.bz2
15 years, 2 months
rpms/mock-rpmfusion-nonfree/F-10 mock-rpmfusion-nonfree.spec, NONE, 1.1 sources, 1.1, 1.2
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/mock-rpmfusion-nonfree/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv21663
Modified Files:
sources
Added Files:
mock-rpmfusion-nonfree.spec
Log Message:
Import for F-10
--- NEW FILE mock-rpmfusion-nonfree.spec ---
Name: mock-rpmfusion-nonfree
Version: 10.0
Release: 1%{?dist}
Summary: Mock config files for the RPM Fusion NonFree Repository
Group: Development/Tools
License: BSD
URL: http://rpmfusion.org/
Source0: %{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
Requires: mock
%description
Mock config files for the RPM Fusion NonFree Repository
%prep
%setup -q -c
%build
#Nothing to build
%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/mock
install -pm 0644 *.cfg $RPM_BUILD_ROOT%{_sysconfdir}/mock
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/mock/*_nonfree.cfg
%changelog
* Mon Feb 23 2009 kwizart < kwizart at gmail.com > - 10.0-1
- Bump to 10.0
* Fri Feb 20 2009 kwizart < kwizart at gmail.com > - 0.93-1
- Update to 0.93
- Add need_sign repos (desactivated by default).
- Use the same root as the mother distro.
* Thu Dec 18 2008 kwizart < kwizart at gmail.com > - 0.90-1
- Initial package.
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mock-rpmfusion-nonfree/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 23 Feb 2009 11:30:11 -0000 1.1
+++ sources 23 Feb 2009 13:33:07 -0000 1.2
@@ -0,0 +1 @@
+3e6ef45b0bb313a9a8aa85124717ed78 mock-rpmfusion-nonfree-10.0.tar.bz2
15 years, 2 months
rpms/mock-rpmfusion-nonfree/devel mock-rpmfusion-nonfree.spec, NONE, 1.1 sources, 1.1, 1.2 .cvsignore, 1.1, 1.2
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/mock-rpmfusion-nonfree/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv21607
Modified Files:
sources .cvsignore
Added Files:
mock-rpmfusion-nonfree.spec
Log Message:
Import for devel
--- NEW FILE mock-rpmfusion-nonfree.spec ---
Name: mock-rpmfusion-nonfree
Version: 10.0
Release: 1%{?dist}
Summary: Mock config files for the RPM Fusion NonFree Repository
Group: Development/Tools
License: BSD
URL: http://rpmfusion.org/
Source0: %{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
Requires: mock
%description
Mock config files for the RPM Fusion NonFree Repository
%prep
%setup -q -c
%build
#Nothing to build
%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/mock
install -pm 0644 *.cfg $RPM_BUILD_ROOT%{_sysconfdir}/mock
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/mock/*_nonfree.cfg
%changelog
* Mon Feb 23 2009 kwizart < kwizart at gmail.com > - 10.0-1
- Bump to 10.0
* Fri Feb 20 2009 kwizart < kwizart at gmail.com > - 0.93-1
- Update to 0.93
- Add need_sign repos (desactivated by default).
- Use the same root as the mother distro.
* Thu Dec 18 2008 kwizart < kwizart at gmail.com > - 0.90-1
- Initial package.
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mock-rpmfusion-nonfree/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 23 Feb 2009 11:30:11 -0000 1.1
+++ sources 23 Feb 2009 13:32:25 -0000 1.2
@@ -0,0 +1 @@
+3e6ef45b0bb313a9a8aa85124717ed78 mock-rpmfusion-nonfree-10.0.tar.bz2
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mock-rpmfusion-nonfree/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 23 Feb 2009 11:30:11 -0000 1.1
+++ .cvsignore 23 Feb 2009 13:32:25 -0000 1.2
@@ -0,0 +1 @@
+mock-rpmfusion-nonfree-10.0.tar.bz2
15 years, 2 months