rpms/kmodtool/F-10 kmodtool-kmodtool,1.1,1.2 kmodtool.spec,1.1,1.2
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/kmodtool/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv23327
Modified Files:
kmodtool-kmodtool kmodtool.spec
Log Message:
* Sun Dec 14 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 1-14
- don't require the kmod-meta package in kmod-(uname -r) packages
Index: kmodtool-kmodtool
===================================================================
RCS file: /cvs/free/rpms/kmodtool/F-10/kmodtool-kmodtool,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kmodtool-kmodtool 30 Sep 2008 17:05:40 -0000 1.1
+++ kmodtool-kmodtool 17 Dec 2008 17:04:39 -0000 1.2
@@ -139,16 +139,8 @@
- # second part
+ # second part
if [[ ! "${customkernel}" ]]; then
- if [[ ! "${redhatkernel}" ]]; then
- # when we build for custom kernels using "--for-kernels" don't require the meta
- # package, as it's useless and complicates things for the user without need
- cat <<EOF
-Requires: kmod-${kmodname}${kernel_variant} >= %{version}-%{release}
-EOF
- fi
-
cat <<EOF
Requires: kernel-uname-r = ${kernel_uname_r}
BuildRequires: kernel-devel-uname-r = ${kernel_uname_r}
Index: kmodtool.spec
===================================================================
RCS file: /cvs/free/rpms/kmodtool/F-10/kmodtool.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kmodtool.spec 30 Sep 2008 17:05:40 -0000 1.1
+++ kmodtool.spec 17 Dec 2008 17:04:39 -0000 1.2
@@ -1,6 +1,6 @@
Name: kmodtool
Version: 1
-Release: 13%{?dist}
+Release: 14%{?dist}
Summary: Tool for building kmod packages
Group: Development/Tools
@@ -51,6 +51,9 @@
%{_datadir}/%{name}/
%changelog
+* Sun Dec 14 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 1-14
+- don't require the kmod-meta package in kmod-(uname -r) packages
+
* Tue Sep 30 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 1-13
- rebuild for RPM Fusion
15 years, 11 months
rpms/nvidia-kmod/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 nvidia-kmod.spec, 1.13, 1.14
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv23203
Modified Files:
.cvsignore sources nvidia-kmod.spec
Log Message:
- Update to 180.16
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 13 Nov 2008 09:35:25 -0000 1.4
+++ .cvsignore 17 Dec 2008 17:04:15 -0000 1.5
@@ -1 +1 @@
-nvidia-kmod-data-177.82.tar.bz2
+nvidia-kmod-data-180.16.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 13 Nov 2008 09:35:25 -0000 1.4
+++ sources 17 Dec 2008 17:04:15 -0000 1.5
@@ -1 +1 @@
-d5df90ad29e8a73723cb9553c4c4b0c1 nvidia-kmod-data-177.82.tar.bz2
+f2a0a80f487796b5e6d6f3574acdd407 nvidia-kmod-data-180.16.tar.bz2
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nvidia-kmod.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- nvidia-kmod.spec 14 Dec 2008 18:09:01 -0000 1.13
+++ nvidia-kmod.spec 17 Dec 2008 17:04:15 -0000 1.14
@@ -3,12 +3,12 @@
# "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: nvidia-kmod
-Version: 177.82
+Version: 180.16
# Taken over by kmodtool
-Release: 1%{?dist}.5
+Release: 1%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -94,6 +94,9 @@
%changelog
+* Wed Dec 17 2008 kwizart < kwizart at gmail.com > - 180.16-1
+- Update to 180.16
+
* Sun Dec 14 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 177.82-1.5
- rebuild for latest Fedora kernel;
15 years, 11 months
rpms/gpac/devel 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 .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.patch, 1.1, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/gpac/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv13743/devel
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
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 to 0.4.5 Final
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)
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gpac/devel/.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 17 Dec 2008 14:18:44 -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/devel/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 17 Dec 2008 14:18:44 -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/devel/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 17 Dec 2008 14:18:44 -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,25 @@
Name: gpac
Summary: MPEG-4 multimedia framework
Version: 0.4.5
-Release: 0.5.%{cvs}cvs%{?dist}
+Release: 1%{?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
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 +51,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 +125,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 +137,25 @@
%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
## 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 +176,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 +209,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 +226,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 +243,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 +262,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}
@@ -343,12 +303,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 +326,12 @@
%endif
%changelog
+* 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/devel/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 17 Dec 2008 14:18:44 -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, 11 months
rpms/bsnes/F-9 README.bsnes,1.1,1.2 bsnes.spec,1.2,1.3
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/bsnes/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8093
Modified Files:
README.bsnes bsnes.spec
Log Message:
More 0.038 fixes
Index: README.bsnes
===================================================================
RCS file: /cvs/nonfree/rpms/bsnes/F-9/README.bsnes,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README.bsnes 4 Dec 2008 23:37:27 -0000 1.1
+++ README.bsnes 17 Dec 2008 12:47:09 -0000 1.2
@@ -3,45 +3,24 @@
1. Problems with PulseAudio
-bsnes does not work very well with PulseAudio, which is enabled in Fedora by
-default. With one exception, trying to use it will result in 100 % CPU usage
-and necessity to kill the program. The emulator has four audio drivers:
-ALSA, libao, OpenAL and OSS. It is possible to make bsnes work using the
-following workarounds:
+Some bsnes audio drivers do not work very well with PulseAudio, which is enabled in Fedora by default. Trying to use these will result in 100 % CPU usage and necessity to kill the program. The emulator has five audio drivers: ALSA, libao, OpenAL and OSS. The way they work with PA is described below:
-- ALSA: will not work with default Fedora config, you need to remove
- alsa-plugins-pulseaudio or disable the said plugin
+- ALSA: will not work with default Fedora config, you need to remove alsa-plugins-pulseaudio or disable the said plugin
- OpenAL: works with default Fedora config
-- libao: will not work with default Fedora config, you need to change the libao
- driver to something different than pulse (but if you change it to alsa, you
- will need to disable the alsa pulse plugin as well)
- OSS: works with default Fedora config, will not work with padsp
+- PulseAudio: works with default Fedora config
+- libao: will not work with default Fedora config, you need to change the libao driver to something different than pulse (but if you change it to alsa, you will need to disable the alsa pulse plugin as well)
-bsnes audio drivers can be changed by going to Settings -> Configuration ->
-Drivers. Program needs to be restarted for the changes to have effect.
+bsnes audio drivers can be changed by going to Settings -> Configuration -> Drivers. Program needs to be restarted for the changes to have effect.
2. Using system zlib
-This is the post byuu made on zsnes boards when asked to merge the system-zlib
-patch (it was more complex at that stage, using system libs was optional, but
-since it was not going to be merged anyway, I decided to make it simpler):
-
-
-I don't really want to add this change to bsnes, no. A system-wide zlib would
-require a DLL for Windows, and I see no reason to provide a lean, stripped
-down zlib along with bsnes for Windows users, yet have an option to use the
-system version for Linux (especially when there is no similar lib for JMA),
-just to appease a few people with nothing better to do than complain about
-random garbage.
-
-However, feel free to appease the Fedora development team by changing that in
-your source tree if you like. My sincere apologies that you'll have to keep
-backporting the change.
-
-I don't want any part in trying to appease these people. They constantly bring
-up crap about non-commercial clauses, about using a 64-byte IPLROM, about
-compiling in support for OSS by default, and now about a massive ~80kb that
-can be shaved off the bsnes binary by adding extra dependencies to the
-emulator. Perhaps I should just start offering a raw Linux binary on my
-website ala nVidia, Macromedia et al.
+This is the post byuu made on zsnes boards when asked to merge the system-zlib patch (it was more complex at that stage, using system libs was optional, but since it was not going to be merged anyway, I decided to make it simpler):
+
+
+I don't really want to add this change to bsnes, no. A system-wide zlib would require a DLL for Windows, and I see no reason to provide a lean, stripped down zlib along with bsnes for Windows users, yet have an option to use the system version for Linux (especially when there is no similar lib for JMA), just to appease a few people with nothing better to do than complain about random garbage.
+
+However, feel free to appease the Fedora development team by changing that in your source tree if you like. My sincere apologies that you'll have to keep backporting the change.
+
+I don't want any part in trying to appease these people. They constantly bring up crap about non-commercial clauses, about using a 64-byte IPLROM, about compiling in support for OSS by default, and now about a massive ~80kb that can be shaved off the bsnes binary by adding extra dependencies to the emulator. Perhaps I should just start offering a raw Linux binary on my website ala nVidia, Macromedia et al.
Index: bsnes.spec
===================================================================
RCS file: /cvs/nonfree/rpms/bsnes/F-9/bsnes.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bsnes.spec 17 Dec 2008 09:27:50 -0000 1.2
+++ bsnes.spec 17 Dec 2008 12:47:09 -0000 1.3
@@ -25,8 +25,8 @@
BuildRequires: libXv-devel
BuildRequires: libXtst-devel
BuildRequires: minizip-devel
+BuildRequires: pulseaudio-libs-devel
BuildRequires: SDL-devel
-BuildRequires: yasm
#libco, which is used by bsnes, only supports these
ExclusiveArch: i386 x86_64
@@ -86,6 +86,8 @@
- Updated to 0.038
- Updated system zlib patch (.h → .hpp)
- License and readme are now accessible through the executable
+- Added pulseaudio-libs-devel to BuildRequires, dropped yasm
+- Updated README.Fedora (PulseAudio driver)
* Fri Dec 5 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.037a-5
- Explained why system snes_ntsc is not used
15 years, 11 months
rpms/bsnes/F-10 README.bsnes,1.1,1.2 bsnes.spec,1.2,1.3
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/bsnes/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8019
Modified Files:
README.bsnes bsnes.spec
Log Message:
More 0.038 fixes
Index: README.bsnes
===================================================================
RCS file: /cvs/nonfree/rpms/bsnes/F-10/README.bsnes,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README.bsnes 4 Dec 2008 23:35:50 -0000 1.1
+++ README.bsnes 17 Dec 2008 12:47:02 -0000 1.2
@@ -3,45 +3,24 @@
1. Problems with PulseAudio
-bsnes does not work very well with PulseAudio, which is enabled in Fedora by
-default. With one exception, trying to use it will result in 100 % CPU usage
-and necessity to kill the program. The emulator has four audio drivers:
-ALSA, libao, OpenAL and OSS. It is possible to make bsnes work using the
-following workarounds:
+Some bsnes audio drivers do not work very well with PulseAudio, which is enabled in Fedora by default. Trying to use these will result in 100 % CPU usage and necessity to kill the program. The emulator has five audio drivers: ALSA, libao, OpenAL and OSS. The way they work with PA is described below:
-- ALSA: will not work with default Fedora config, you need to remove
- alsa-plugins-pulseaudio or disable the said plugin
+- ALSA: will not work with default Fedora config, you need to remove alsa-plugins-pulseaudio or disable the said plugin
- OpenAL: works with default Fedora config
-- libao: will not work with default Fedora config, you need to change the libao
- driver to something different than pulse (but if you change it to alsa, you
- will need to disable the alsa pulse plugin as well)
- OSS: works with default Fedora config, will not work with padsp
+- PulseAudio: works with default Fedora config
+- libao: will not work with default Fedora config, you need to change the libao driver to something different than pulse (but if you change it to alsa, you will need to disable the alsa pulse plugin as well)
-bsnes audio drivers can be changed by going to Settings -> Configuration ->
-Drivers. Program needs to be restarted for the changes to have effect.
+bsnes audio drivers can be changed by going to Settings -> Configuration -> Drivers. Program needs to be restarted for the changes to have effect.
2. Using system zlib
-This is the post byuu made on zsnes boards when asked to merge the system-zlib
-patch (it was more complex at that stage, using system libs was optional, but
-since it was not going to be merged anyway, I decided to make it simpler):
-
-
-I don't really want to add this change to bsnes, no. A system-wide zlib would
-require a DLL for Windows, and I see no reason to provide a lean, stripped
-down zlib along with bsnes for Windows users, yet have an option to use the
-system version for Linux (especially when there is no similar lib for JMA),
-just to appease a few people with nothing better to do than complain about
-random garbage.
-
-However, feel free to appease the Fedora development team by changing that in
-your source tree if you like. My sincere apologies that you'll have to keep
-backporting the change.
-
-I don't want any part in trying to appease these people. They constantly bring
-up crap about non-commercial clauses, about using a 64-byte IPLROM, about
-compiling in support for OSS by default, and now about a massive ~80kb that
-can be shaved off the bsnes binary by adding extra dependencies to the
-emulator. Perhaps I should just start offering a raw Linux binary on my
-website ala nVidia, Macromedia et al.
+This is the post byuu made on zsnes boards when asked to merge the system-zlib patch (it was more complex at that stage, using system libs was optional, but since it was not going to be merged anyway, I decided to make it simpler):
+
+
+I don't really want to add this change to bsnes, no. A system-wide zlib would require a DLL for Windows, and I see no reason to provide a lean, stripped down zlib along with bsnes for Windows users, yet have an option to use the system version for Linux (especially when there is no similar lib for JMA), just to appease a few people with nothing better to do than complain about random garbage.
+
+However, feel free to appease the Fedora development team by changing that in your source tree if you like. My sincere apologies that you'll have to keep backporting the change.
+
+I don't want any part in trying to appease these people. They constantly bring up crap about non-commercial clauses, about using a 64-byte IPLROM, about compiling in support for OSS by default, and now about a massive ~80kb that can be shaved off the bsnes binary by adding extra dependencies to the emulator. Perhaps I should just start offering a raw Linux binary on my website ala nVidia, Macromedia et al.
Index: bsnes.spec
===================================================================
RCS file: /cvs/nonfree/rpms/bsnes/F-10/bsnes.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bsnes.spec 17 Dec 2008 09:27:28 -0000 1.2
+++ bsnes.spec 17 Dec 2008 12:47:02 -0000 1.3
@@ -25,8 +25,8 @@
BuildRequires: libXv-devel
BuildRequires: libXtst-devel
BuildRequires: minizip-devel
+BuildRequires: pulseaudio-libs-devel
BuildRequires: SDL-devel
-BuildRequires: yasm
#libco, which is used by bsnes, only supports these
ExclusiveArch: i386 x86_64
@@ -86,6 +86,8 @@
- Updated to 0.038
- Updated system zlib patch (.h → .hpp)
- License and readme are now accessible through the executable
+- Added pulseaudio-libs-devel to BuildRequires, dropped yasm
+- Updated README.Fedora (PulseAudio driver)
* Fri Dec 5 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.037a-5
- Explained why system snes_ntsc is not used
15 years, 11 months
rpms/bsnes/devel README.bsnes,1.1,1.2 bsnes.spec,1.2,1.3
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/bsnes/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv7938
Modified Files:
README.bsnes bsnes.spec
Log Message:
More 0.038 fixes
Index: README.bsnes
===================================================================
RCS file: /cvs/nonfree/rpms/bsnes/devel/README.bsnes,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README.bsnes 4 Dec 2008 23:33:52 -0000 1.1
+++ README.bsnes 17 Dec 2008 12:46:54 -0000 1.2
@@ -3,45 +3,24 @@
1. Problems with PulseAudio
-bsnes does not work very well with PulseAudio, which is enabled in Fedora by
-default. With one exception, trying to use it will result in 100 % CPU usage
-and necessity to kill the program. The emulator has four audio drivers:
-ALSA, libao, OpenAL and OSS. It is possible to make bsnes work using the
-following workarounds:
+Some bsnes audio drivers do not work very well with PulseAudio, which is enabled in Fedora by default. Trying to use these will result in 100 % CPU usage and necessity to kill the program. The emulator has five audio drivers: ALSA, libao, OpenAL and OSS. The way they work with PA is described below:
-- ALSA: will not work with default Fedora config, you need to remove
- alsa-plugins-pulseaudio or disable the said plugin
+- ALSA: will not work with default Fedora config, you need to remove alsa-plugins-pulseaudio or disable the said plugin
- OpenAL: works with default Fedora config
-- libao: will not work with default Fedora config, you need to change the libao
- driver to something different than pulse (but if you change it to alsa, you
- will need to disable the alsa pulse plugin as well)
- OSS: works with default Fedora config, will not work with padsp
+- PulseAudio: works with default Fedora config
+- libao: will not work with default Fedora config, you need to change the libao driver to something different than pulse (but if you change it to alsa, you will need to disable the alsa pulse plugin as well)
-bsnes audio drivers can be changed by going to Settings -> Configuration ->
-Drivers. Program needs to be restarted for the changes to have effect.
+bsnes audio drivers can be changed by going to Settings -> Configuration -> Drivers. Program needs to be restarted for the changes to have effect.
2. Using system zlib
-This is the post byuu made on zsnes boards when asked to merge the system-zlib
-patch (it was more complex at that stage, using system libs was optional, but
-since it was not going to be merged anyway, I decided to make it simpler):
-
-
-I don't really want to add this change to bsnes, no. A system-wide zlib would
-require a DLL for Windows, and I see no reason to provide a lean, stripped
-down zlib along with bsnes for Windows users, yet have an option to use the
-system version for Linux (especially when there is no similar lib for JMA),
-just to appease a few people with nothing better to do than complain about
-random garbage.
-
-However, feel free to appease the Fedora development team by changing that in
-your source tree if you like. My sincere apologies that you'll have to keep
-backporting the change.
-
-I don't want any part in trying to appease these people. They constantly bring
-up crap about non-commercial clauses, about using a 64-byte IPLROM, about
-compiling in support for OSS by default, and now about a massive ~80kb that
-can be shaved off the bsnes binary by adding extra dependencies to the
-emulator. Perhaps I should just start offering a raw Linux binary on my
-website ala nVidia, Macromedia et al.
+This is the post byuu made on zsnes boards when asked to merge the system-zlib patch (it was more complex at that stage, using system libs was optional, but since it was not going to be merged anyway, I decided to make it simpler):
+
+
+I don't really want to add this change to bsnes, no. A system-wide zlib would require a DLL for Windows, and I see no reason to provide a lean, stripped down zlib along with bsnes for Windows users, yet have an option to use the system version for Linux (especially when there is no similar lib for JMA), just to appease a few people with nothing better to do than complain about random garbage.
+
+However, feel free to appease the Fedora development team by changing that in your source tree if you like. My sincere apologies that you'll have to keep backporting the change.
+
+I don't want any part in trying to appease these people. They constantly bring up crap about non-commercial clauses, about using a 64-byte IPLROM, about compiling in support for OSS by default, and now about a massive ~80kb that can be shaved off the bsnes binary by adding extra dependencies to the emulator. Perhaps I should just start offering a raw Linux binary on my website ala nVidia, Macromedia et al.
Index: bsnes.spec
===================================================================
RCS file: /cvs/nonfree/rpms/bsnes/devel/bsnes.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bsnes.spec 17 Dec 2008 09:27:39 -0000 1.2
+++ bsnes.spec 17 Dec 2008 12:46:54 -0000 1.3
@@ -25,8 +25,8 @@
BuildRequires: libXv-devel
BuildRequires: libXtst-devel
BuildRequires: minizip-devel
+BuildRequires: pulseaudio-libs-devel
BuildRequires: SDL-devel
-BuildRequires: yasm
#libco, which is used by bsnes, only supports these
ExclusiveArch: i386 x86_64
@@ -86,6 +86,8 @@
- Updated to 0.038
- Updated system zlib patch (.h → .hpp)
- License and readme are now accessible through the executable
+- Added pulseaudio-libs-devel to BuildRequires, dropped yasm
+- Updated README.Fedora (PulseAudio driver)
* Fri Dec 5 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.037a-5
- Explained why system snes_ntsc is not used
15 years, 11 months
rpms/vice/devel vice.spec,1.3,1.4
by jwrdegoede
Author: jwrdegoede
Update of /cvs/nonfree/rpms/vice/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv2353
Modified Files:
vice.spec
Log Message:
* Wed Dec 17 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 2.0-2
- Replace htmlview requires with xdg-utils, as we have use xdg-open now
Index: vice.spec
===================================================================
RCS file: /cvs/nonfree/rpms/vice/devel/vice.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vice.spec 1 Aug 2008 10:23:03 -0000 1.3
+++ vice.spec 17 Dec 2008 11:06:45 -0000 1.4
@@ -1,6 +1,6 @@
Name: vice
Version: 2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Emulator for a variety of Commodore 8bit machines
Group: Applications/Emulators
License: GPL
@@ -24,7 +24,7 @@
BuildRequires: giflib-devel libjpeg-devel libgnomeui-devel ffmpeg-devel
BuildRequires: ncurses-devel readline-devel SDL-devel alsa-lib-devel
BuildRequires: bison flex gettext info desktop-file-utils xorg-x11-font-utils
-Requires: hicolor-icon-theme htmlview
+Requires: hicolor-icon-theme xdg-utils
%description
An emulator for a variety of Commodore 8bit machines, including the C16, C64,
@@ -116,6 +116,9 @@
%changelog
+* Wed Dec 17 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 2.0-2
+- Replace htmlview requires with xdg-utils, as we have use xdg-open now
+
* Fri Aug 1 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 2.0-1
- New upstream release 2.0
15 years, 11 months
rpms/bubbros/devel bubbros.spec,1.4,1.5
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/bubbros/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv1833
Modified Files:
bubbros.spec
Log Message:
* Wed Dec 17 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.6-4
- Drop no longer needed htmlview requires
Index: bubbros.spec
===================================================================
RCS file: /cvs/free/rpms/bubbros/devel/bubbros.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- bubbros.spec 17 Dec 2008 09:29:00 -0000 1.4
+++ bubbros.spec 17 Dec 2008 11:04:25 -0000 1.5
@@ -1,6 +1,6 @@
Name: bubbros
Version: 1.6
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Bub and Brothers game inspired by the classic Bubble and Bobble
Group: Amusements/Games
License: MIT and Artistic Licenses
@@ -11,7 +11,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python-devel ImageMagick desktop-file-utils libX11-devel
BuildRequires: libXext-devel xorg-x11-proto-devel java-1.4.2-gcj-compat-devel
-Requires: pygame pygtk2 htmlview hicolor-icon-theme
+Requires: pygame pygtk2 hicolor-icon-theme
%description
This is a direct clone of the MacOS game Bub & Bob of McSebi. Thanks Sebi for
@@ -122,6 +122,9 @@
%changelog
+* Wed Dec 17 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.6-4
+- Drop no longer needed htmlview requires
+
* Wed Dec 17 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.6-3
- Rebuild for new python
15 years, 11 months
rpms/smc-music/devel smc-music.spec,1.2,1.3
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/smc-music/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv981
Modified Files:
smc-music.spec
Log Message:
* Wed Dec 17 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 4.0-3
- Fix directory ownership issues (rpmfusion 223)
Index: smc-music.spec
===================================================================
RCS file: /cvs/free/rpms/smc-music/devel/smc-music.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- smc-music.spec 25 Jul 2008 19:02:47 -0000 1.2
+++ smc-music.spec 17 Dec 2008 10:54:50 -0000 1.3
@@ -2,7 +2,7 @@
Name: smc-music
Version: 4.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Additional music for Secret Maryo Chronicles
Group: Amusements/Games
License: GPLv3
@@ -48,14 +48,14 @@
%files
%defattr(-,root,root,-)
-%{datapath}/music/*/*.ogg
-# Note this dir is intentionally owned by this rpm and not smc as smc doesn't
-# have it by default.
-%dir %{datapath}/music/story
%doc credits.txt docs/license.txt
+%{datapath}/music/*
%changelog
+* Wed Dec 17 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 4.0-3
+- Fix directory ownership issues (rpmfusion 223)
+
* Fri Jul 25 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 4.0-2
- Release bump for rpmfusion
15 years, 11 months