rpms/gpac/devel gpac-0.4.6-ffmpeg.patch, NONE, 1.1 gpac-0.4.6-js_cflags.patch, NONE, 1.1 gpac-0.4.6-libxml2.patch, NONE, 1.1 gpac-0.4.6-makefix.patch, NONE, 1.1 gpac-0.4.6-ogl_libs.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 gpac.spec, 1.10, 1.11 sources, 1.3, 1.4 gpac-0.4.5-ffmpeg.patch, 1.1, NONE gpac-0.4.5-libxml2.patch, 1.2, NONE gpac-0.4.5-makefix.patch, 1.1, NONE gpac-ppc64.patch, 1.1, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/gpac/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv18752/devel
Modified Files:
.cvsignore gpac.spec sources
Added Files:
gpac-0.4.6-ffmpeg.patch gpac-0.4.6-js_cflags.patch
gpac-0.4.6-libxml2.patch gpac-0.4.6-makefix.patch
gpac-0.4.6-ogl_libs.patch
Removed Files:
gpac-0.4.5-ffmpeg.patch gpac-0.4.5-libxml2.patch
gpac-0.4.5-makefix.patch gpac-ppc64.patch
Log Message:
Update gpac
gpac-0.4.6-ffmpeg.patch:
--- NEW FILE gpac-0.4.6-ffmpeg.patch ---
diff -up gpac/configure.ffmpeg gpac/configure
--- gpac/configure.ffmpeg 2009-09-01 16:50:50.270496559 +0200
+++ gpac/configure 2009-09-01 17:59:05.902493824 +0200
@@ -808,25 +808,19 @@ cat > $TMPC << EOF
int main( void ) { return 0; }
EOF
-if $cc $TMPO -c $TMPC 2> /dev/null ; then
-old_ffmpeg_inc="no"
+if pkg-config --exists libavcodec libavformat libswscale 2> /dev/null ; then
+ ffmpeg_cflags=`pkg-config --cflags libavcodec libavformat libswscale`
+ ffmpeg_lflags=`pkg-config --libs libavcodec libavformat libswscale`
+ has_ffmpeg="system"
else
-
-old_ffmpeg_inc="yes"
-
-cat > $TMPC << EOF
-#include <ffmpeg/avcodec.h>
-int main( void ) { return 0; }
-EOF
-
-fi
-
+ ffmpeg_cflags=
+ ffmpeg_lflags=`-lavcodec -lavformat`
if test "$cross_prefix" != "" ; then
- if $cc -o $TMPO $TMPC -I$prefix/include -L$prefix/lib -lz -lavcodec -lavformat -lavutil 2> /dev/null ; then
+ if $cc -o $TMPO $TMPC -I$prefix/include -L$prefix/lib -lz $ffmpeg_lflags -lavutil 2> /dev/null ; then
has_ffmpeg="system"
else
- if $cc -o $TMPO $TMPC -I$local_inc -L$local_lib -lz -lavcodec -lavformat 2> /dev/null ; then
+ if $cc -o $TMPO $TMPC -I$local_inc -L$local_lib -lz $ffmpeg_lflags 2> /dev/null ; then
has_ffmpeg="local"
fi
fi
@@ -841,6 +835,7 @@ else
has_ffmpeg="local"
fi
fi
+fi
#look for vorbis support
cat > $TMPC << EOF
@@ -1912,6 +1907,10 @@ echo "CONFIG_VORBIS=$has_vorbis" >> conf
echo "CONFIG_THEORA=$has_theora" >> config.mak
echo "CONFIG_FFMPEG=$has_ffmpeg" >> config.mak
echo "CONFIG_FFMPEG_OLD=$old_ffmpeg_inc" >> config.mak
+if test x$has_ffmpeg != x ; then
+ echo "FFMPEG_CFLAGS=$ffmpeg_cflags" >> config.mak
+ echo "FFMPEG_LFLAGS=$ffmpeg_lflags" >> config.mak
+fi
echo "CONFIG_OSS_AUDIO=$has_oss_audio" >> config.mak
echo "CONFIG_ALSA=$has_alsa" >> config.mak
diff -up gpac/modules/ffmpeg_in/Makefile.ffmpeg gpac/modules/ffmpeg_in/Makefile
--- gpac/modules/ffmpeg_in/Makefile.ffmpeg 2009-07-31 09:37:41.000000000 +0200
+++ gpac/modules/ffmpeg_in/Makefile 2009-09-01 17:49:55.333497907 +0200
@@ -2,7 +2,7 @@ include ../../config.mak
vpath %.c $(SRC_PATH)/modules/ffmpeg_in
-CFLAGS= $(OPTFLAGS) -I$(SRC_PATH)/include
+CFLAGS= $(OPTFLAGS) -I$(SRC_PATH)/include $(FFMPEG_CFLAGS)
ifeq ($(DEBUGBUILD), yes)
CFLAGS+=-g
@@ -15,13 +15,11 @@ LDFLAGS+=-pg
endif
LOCAL_LIB=
-LINKLIBS=-lgpac -lavcodec -lavformat -lz
+LINKLIBS=-lgpac $(FFMPEG_LFLAGS) -lz
#old ffmpeg lib
ifeq ($(CONFIG_FFMPEG_OLD), yes)
CFLAGS+=-DFFMPEG_OLD_HEADERS
-else
-LINKLIBS+=-lswscale
endif
#common obj
gpac-0.4.6-js_cflags.patch:
--- NEW FILE gpac-0.4.6-js_cflags.patch ---
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
gpac-0.4.6-libxml2.patch:
--- NEW FILE gpac-0.4.6-libxml2.patch ---
diff -up gpac/applications/generators/SVG/Makefile.libxml2 gpac/applications/generators/SVG/Makefile
--- gpac/applications/generators/SVG/Makefile.libxml2 2009-09-01 16:12:48.317745990 +0200
+++ gpac/applications/generators/SVG/Makefile 2009-09-01 16:14:27.221497909 +0200
@@ -37,7 +37,7 @@ SRCS := $(OBJS:.o=.c)
all: $(PROG)
SVGGen$(EXE): $(OBJS)
- $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(XML2_LFLAGS) $(EXTRALIBS)
+ $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(XML2_LIBS) $(EXTRALIBS)
%.o: %.c
diff -up gpac/applications/generators/SVG/Makefile.shared.libxml2 gpac/applications/generators/SVG/Makefile.shared
--- gpac/applications/generators/SVG/Makefile.shared.libxml2 2008-11-24 09:40:04.000000000 +0100
+++ gpac/applications/generators/SVG/Makefile.shared 2009-09-01 16:20:46.049498877 +0200
@@ -35,7 +35,7 @@ SRCS := $(OBJS:.o=.c)
all: $(PROG)
SVGGen$(EXE): $(OBJS)
- $(CC) $(LDFLAGS) -o $@ $(OBJS) $(XML2_LFLAGS) $(EXTRALIBS)
+ $(CC) $(LDFLAGS) -o $@ $(OBJS) $(XML2_LIBS) $(EXTRALIBS)
%.o: %.c
diff -up gpac/applications/testapps/loadcompare/Makefile.libxml2 gpac/applications/testapps/loadcompare/Makefile
--- gpac/applications/testapps/loadcompare/Makefile.libxml2 2008-11-24 09:56:20.000000000 +0100
+++ gpac/applications/testapps/loadcompare/Makefile 2009-09-01 16:21:19.341500133 +0200
@@ -29,7 +29,7 @@ else
EXT=
PROG=LoadCompare
#LINKFLAGS+=-lgpac_static $(EXTRALIBS) $(GPAC_SH_FLAGS) -lz
-LINKFLAGS+=-lgpac -lz $(XML2_LFLAGS)
+LINKFLAGS+=-lgpac -lz $(XML2_LIBS)
endif
diff -up gpac/configure.libxml2 gpac/configure
--- gpac/configure.libxml2 2009-09-01 16:15:10.226496731 +0200
+++ gpac/configure 2009-09-01 16:18:23.287494600 +0200
@@ -87,6 +87,7 @@ has_ipv6="no"
has_dvb4linux="no"
has_xmlrpc="no"
has_openjpeg="no"
+has_libxml2="no"
gprof_build="no"
PIC_CFLAGS=""
want_pic="no"
@@ -980,6 +981,16 @@ fi
fi
#end wx test
+# If svg isn't disabled
+if test "$disable_svg" != "yes"; then
+# Then we check libxm2 presence via pkg-config
+ if pkg-config libxml-2.0 --exists > /dev/null 2>&1 ; then
+ libxml2_cflags=`pkg-config libxml-2.0 --cflags`
+ libxml2_lib_flags=`pkg-config libxml-2.0 --libs`
+ has_libxml2="yes"
+ fi
+fi
+
# look for IPv6
cat > $TMPC << EOF
@@ -1908,6 +1919,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 "GPAC_USE_TINYGL=$has_tinygl" >> config.mak
echo "OGL_INCLS=$INCL3D" >> config.mak
gpac-0.4.6-makefix.patch:
--- NEW FILE gpac-0.4.6-makefix.patch ---
diff -up gpac/Makefile.makefix gpac/Makefile
--- gpac/Makefile.makefix 2009-07-31 18:43:25.000000000 +0200
+++ gpac/Makefile 2009-09-01 17:14:20.615499921 +0200
@@ -60,11 +60,11 @@ install:
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:
@@ -89,23 +89,25 @@ 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)
+ 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)
+ifeq ($(DESTDIR)$(prefix),$(prefix))
ldconfig || true
endif
endif
+endif
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 -m 644 $(SRC_PATH)/config.h "$(DESTDIR)$(prefix)/include/gpac/configuration.h"
+ install -pm 644 $(SRC_PATH)/include/gpac/modules/*.h "$(DESTDIR)$(prefix)/include/gpac/modules"
+ install -pm 644 $(SRC_PATH)/config.h "$(DESTDIR)$(prefix)/include/gpac/configuration.h"
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)/$(libdir)"
install -m 644 "./bin/gcc/libgpac_static.a" "$(DESTDIR)$(prefix)/$(libdir)"
gpac-0.4.6-ogl_libs.patch:
--- NEW FILE gpac-0.4.6-ogl_libs.patch ---
diff -up gpac/configure.ogl_libs gpac/configure
--- gpac/configure.ogl_libs 2009-09-19 13:29:46.988993098 +0200
+++ gpac/configure 2009-09-19 13:33:34.840741932 +0200
@@ -1319,7 +1319,7 @@ if test "$disable_3d" = "no" ; then
elif test "$darwin" = "yes" ; then
LINK3D="-lgl -lglu"
else
- LINK3D="-lGL -lglut"
+ LINK3D="-lGLU -lGL -lglut"
fi
if $cc -o $TMPO $TMPC $LINK3D 2> /dev/null ; then
has_opengl="yes"
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gpac/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 17 Dec 2008 14:18:44 -0000 1.3
+++ .cvsignore 19 Sep 2009 12:08:42 -0000 1.4
@@ -1 +1 @@
-gpac-0.4.5-repack.tar.bz2
+gpac-20090919.tar.bz2
Index: gpac.spec
===================================================================
RCS file: /cvs/free/rpms/gpac/devel/gpac.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gpac.spec 27 Mar 2009 15:05:19 -0000 1.10
+++ gpac.spec 19 Sep 2009 12:08:42 -0000 1.11
@@ -6,35 +6,38 @@
# - Submit and import patches upstream.
# - Fix unused-direct-shlib-dependency on libgpac
-%define osmo Osmo4
-#define cvs 20080217
-%define with_static 1
-%define with_osmo 0
+%global osmo Osmo4
+%global cvs 20090919
+%global with_osmo 0
# Mozilla stuff fails. It's completely disabled for now.
-%define mozver 3.0
-%define geckover 1.9.1
-%define xuldir %{_datadir}/idl/xulrunner-sdk-%{geckover}
-%define xulbindir %{_libdir}/xulrunner-%{geckover}
+%global mozver 3.0
+%global geckover 1.9.1
+%global xuldir %{_datadir}/idl/xulrunner-sdk-%{geckover}
+%global xulbindir %{_libdir}/xulrunner-%{geckover}
Name: gpac
Summary: MPEG-4 multimedia framework
-Version: 0.4.5
-Release: 7%{?dist}
+Version: 0.4.6
+Release: 0.1.cvs%{?cvs}%{?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-%{version}-repack.tar.bz2
+Source0: http://rpms.kwizart.net/fedora/SOURCE/gpac-%{cvs}.tar.bz2
Source9: gpac-snapshot.sh
-Patch0: gpac-0.4.5-makefix.patch
+#https://sourceforge.net/tracker/?func=detail&atid=571740&aid=2853860&group_id=84101
+Patch0: gpac-0.4.6-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.6-js_cflags.patch
Patch6: gpac-0.4.5-shared_sggen.patch
-Patch7: gpac-0.4.5-libxml2.patch
-Patch8: gpac-ppc64.patch
-Patch9: gpac-0.4.5-ffmpeg.patch
+#https://sourceforge.net/tracker/?func=detail&atid=571740&aid=2853856&group_id=84101
+Patch7: gpac-0.4.6-libxml2.patch
+#https://sourceforge.net/tracker/?func=detail&atid=571740&aid=2853857&group_id=84101
+Patch9: gpac-0.4.6-ffmpeg.patch
+Patch10: gpac-0.4.6-ogl_libs.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
BuildRequires: ImageMagick
@@ -50,6 +53,7 @@
BuildRequires: libmad-devel
BuildRequires: xvidcore-devel >= 1.0.0
BuildRequires: ffmpeg-devel
+BuildRequires: js-devel
BuildRequires: libxml2-devel
BuildRequires: openssl-devel
BuildRequires: openjpeg-devel
@@ -89,14 +93,11 @@
Summary: Development libraries and files for %{name}
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
-%if %{with_static}
-%else
-%endif
%description devel
Development libraries and files for gpac.
-%if %{with_static}
+
%package devel-static
Summary: Development libraries and files for %{name}
Group: Development/Libraries
@@ -105,7 +106,6 @@
%description devel-static
Static library for gpac.
-%endif
%if %{with_osmo}
%package -n %{osmo}
@@ -150,21 +150,17 @@
%patch3 -p1 -b .lib64
%endif
%patch4 -p1 -b .openjpeg
+%patch5 -p1 -b .jscflags
%patch6 -p1 -b .shared
%patch7 -p1 -b .libxml2
-%patch8 -p1 -b .ppc64
%patch9 -p1 -b .ffmpeg
+%patch10 -p1 -b .ogl_libs
## 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
-# Update doxygen
-pushd doc
-doxygen -u
-popd
-
# Fix encoding warnings
cp -p Changelog Changelog.origine
iconv -f ISO-8859-1 -t UTF8 Changelog.origine > Changelog
@@ -260,13 +256,13 @@
#icons
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
-install -m 0644 applications/osmo4_wx/osmo4.xpm $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{osmo}.xpm
+install -pm 0644 applications/osmo4_wx/osmo4.xpm $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{osmo}.xpm
%else
rm -rf $RPM_BUILD_ROOT%{_bindir}/%{osmo}
%endif
## kwizart - rpmlint gpac no-ldconfig-symlink
-ln -sf libgpac.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libgpac.so.0
+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
@@ -324,15 +320,21 @@
%{_includedir}/gpac/
%{_libdir}/libgpac.so
-%if %{with_static}
%files devel-static
%defattr(-,root,root,-)
%{_libdir}/libgpac_static.a
-%else
-%exclude %{_libdir}/libgpac_static.a
-%endif
+
%changelog
+* Sat Sep 19 2009 kwizart < kwizart at gmail.com > - 0.4.6-0.1cvs20090919
+- Update to 0.4.6 pre cvs snapshoot 20090919
+- Fix OGL link flag
+
+* Tue Sep 1 2009 kwizart < kwizart at gmail.com > - 0.4.6-0.1cvs20090901
+- Update to 0.4.6 pre cvs snapshoot 20090901
+- Remove merged patch (1) update old (4)
+- Clean static conditional
+
* Fri Mar 27 2009 kwizart < kwizart at gmail.com > - 0.4.5-7
- Rebuild for faad x264
Index: sources
===================================================================
RCS file: /cvs/free/rpms/gpac/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 17 Dec 2008 14:18:44 -0000 1.3
+++ sources 19 Sep 2009 12:08:42 -0000 1.4
@@ -1 +1 @@
-adf9be7956cf35b01dd14bd622e16e86 gpac-0.4.5-repack.tar.bz2
+3211533978e01971f9817ae844536d76 gpac-20090919.tar.bz2
--- gpac-0.4.5-ffmpeg.patch DELETED ---
--- gpac-0.4.5-libxml2.patch DELETED ---
--- gpac-0.4.5-makefix.patch DELETED ---
--- gpac-ppc64.patch DELETED ---
14 years, 7 months
rpms/sdlmess/F-10 sdlmess-0134-nounidasm.patch, NONE, 1.1 sdlmess.spec, 1.12, 1.13
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/sdlmess/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv10425
Modified Files:
sdlmess.spec
Added Files:
sdlmess-0134-nounidasm.patch
Log Message:
Conditionalised -debug, disabled unidasm
sdlmess-0134-nounidasm.patch:
--- NEW FILE sdlmess-0134-nounidasm.patch ---
diff -up sdlmess-0134/src/tools/tools.mak.nounidasm sdlmess-0134/src/tools/tools.mak
--- sdlmess-0134/src/tools/tools.mak.nounidasm 2009-09-10 15:45:02.000000000 +0200
+++ sdlmess-0134/src/tools/tools.mak 2009-09-17 18:05:12.000000000 +0200
@@ -26,7 +26,6 @@ TOOLS += \
romcmp$(EXE) \
chdman$(EXE) \
jedutil$(EXE) \
- unidasm$(EXE) \
ldresample$(EXE) \
ldverify$(EXE) \
regrep$(EXE) \
@@ -77,19 +76,6 @@ jedutil$(EXE): $(JEDUTILOBJS) $(LIBUTIL)
#-------------------------------------------------
-# unidasm
-#-------------------------------------------------
-
-UNIDASMOBJS = \
- $(TOOLSOBJ)/unidasm.o \
-
-unidasm$(EXE): $(UNIDASMOBJS) $(LIBUTIL) $(LIBOCORE) $(LIBDASM) $(ZLIB) $(EXPAT)
- @echo Linking $@...
- $(LD) $(LDFLAGS) $^ $(LIBS) -o $@
-
-
-
-#-------------------------------------------------
# ldresample
#-------------------------------------------------
Index: sdlmess.spec
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmess/F-10/sdlmess.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sdlmess.spec 17 Sep 2009 12:23:30 -0000 1.12
+++ sdlmess.spec 17 Sep 2009 16:51:51 -0000 1.13
@@ -1,3 +1,6 @@
+# the debug build is disabled by default, please use --with debug to override
+%bcond_with debug
+
%ifarch x86_64
%define arch_flags PTR64=1
%endif
@@ -23,6 +26,7 @@
Patch0: %{name}-warnings.patch
Patch1: %{name}-expat.patch
Patch3: %{name}-fortify.patch
+Patch4: %{name}-0134-nounidasm.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL-devel expat-devel zlib-devel libGL-devel gtk2-devel unrar
@@ -57,19 +61,13 @@
%description data
%{summary}.
-%package debug
-Summary: Debug enabled version of sdlmess
-Group: Applications/Emulators
-
-%description debug
-%{summary}.
-
%prep
%setup -qn %{name}%{version}
%patch0 -p0 -b .warnings~
%patch1 -p0 -b .expat~
%patch3 -p0 -b .fortify
+%patch4 -p1 -b .nounidasm
# Create mess.ini file
cat > mess.ini << EOF
@@ -117,10 +115,13 @@
%build
+%if %{with debug}
make %{?_smp_mflags} %{?arch_flags} DEBUG=1 SYMBOLS=1 OPTIMIZE=2\
OPT_FLAGS='%{optflags} -DINI_PATH="\"%{_sysconfdir}/mess;\""' -f makefile.sdl
+%else
make %{?_smp_mflags} %{?arch_flags} SYMBOLS=1 OPTIMIZE=2\
OPT_FLAGS='%{optflags} -DINI_PATH="\"%{_sysconfdir}/mess;\""' -f makefile.sdl
+%endif
%install
@@ -148,8 +149,11 @@
install -d %{buildroot}%{_sysconfdir}/skel/.mess/snap
# Install binaries and config files
-install -pm 755 mess %{buildroot}%{_bindir}/mess
+%if %{with debug}
install -pm 755 messd %{buildroot}%{_bindir}/messd
+%else
+install -pm 755 mess %{buildroot}%{_bindir}/mess
+%endif
install -pm 755 castool imgtool messtest %{buildroot}%{_bindir}
install -pm 644 sysinfo.dat %{buildroot}%{_datadir}/mess
install -pm 644 artwork/* %{buildroot}%{_datadir}/mess/artwork
@@ -171,7 +175,11 @@
%doc *.txt docs/*
%config(noreplace) %{_sysconfdir}/mess/mess.ini
%dir %{_sysconfdir}/mess
+%if %{with debug}
+%{_bindir}/messd
+%else
%{_bindir}/mess
+%endif
%dir %{_datadir}/mess
%dir %{_datadir}/mess/artwork
%dir %{_datadir}/mess/roms
@@ -197,16 +205,13 @@
%{_datadir}/mess/ctrlr/*
%{_datadir}/mess/hash/*
-%files debug
-%defattr(-,root,root,-)
-%doc docs/license.txt
-%{_bindir}/messd
-
%changelog
* Thu Sep 17 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0134-1
- Updated to 0.134
- Updated the warnings patch
+- Made the -debug build optional
+- Disabled unidasm until MAME bug #3442 is fixed
* Fri Jul 24 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0133-1
- Updated to 0.133
14 years, 7 months
rpms/sdlmess/F-11 sdlmess-0134-nounidasm.patch, NONE, 1.1 sdlmess.spec, 1.13, 1.14
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/sdlmess/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv10325
Modified Files:
sdlmess.spec
Added Files:
sdlmess-0134-nounidasm.patch
Log Message:
Conditionalised -debug, disabled unidasm
sdlmess-0134-nounidasm.patch:
--- NEW FILE sdlmess-0134-nounidasm.patch ---
diff -up sdlmess-0134/src/tools/tools.mak.nounidasm sdlmess-0134/src/tools/tools.mak
--- sdlmess-0134/src/tools/tools.mak.nounidasm 2009-09-10 15:45:02.000000000 +0200
+++ sdlmess-0134/src/tools/tools.mak 2009-09-17 18:05:12.000000000 +0200
@@ -26,7 +26,6 @@ TOOLS += \
romcmp$(EXE) \
chdman$(EXE) \
jedutil$(EXE) \
- unidasm$(EXE) \
ldresample$(EXE) \
ldverify$(EXE) \
regrep$(EXE) \
@@ -77,19 +76,6 @@ jedutil$(EXE): $(JEDUTILOBJS) $(LIBUTIL)
#-------------------------------------------------
-# unidasm
-#-------------------------------------------------
-
-UNIDASMOBJS = \
- $(TOOLSOBJ)/unidasm.o \
-
-unidasm$(EXE): $(UNIDASMOBJS) $(LIBUTIL) $(LIBOCORE) $(LIBDASM) $(ZLIB) $(EXPAT)
- @echo Linking $@...
- $(LD) $(LDFLAGS) $^ $(LIBS) -o $@
-
-
-
-#-------------------------------------------------
# ldresample
#-------------------------------------------------
Index: sdlmess.spec
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmess/F-11/sdlmess.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sdlmess.spec 17 Sep 2009 12:23:15 -0000 1.13
+++ sdlmess.spec 17 Sep 2009 16:51:44 -0000 1.14
@@ -1,3 +1,6 @@
+# the debug build is disabled by default, please use --with debug to override
+%bcond_with debug
+
%ifarch x86_64
%define arch_flags PTR64=1
%endif
@@ -23,6 +26,7 @@
Patch0: %{name}-warnings.patch
Patch1: %{name}-expat.patch
Patch3: %{name}-fortify.patch
+Patch4: %{name}-0134-nounidasm.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL-devel expat-devel zlib-devel libGL-devel gtk2-devel unrar
@@ -57,19 +61,13 @@
%description data
%{summary}.
-%package debug
-Summary: Debug enabled version of sdlmess
-Group: Applications/Emulators
-
-%description debug
-%{summary}.
-
%prep
%setup -qn %{name}%{version}
%patch0 -p0 -b .warnings~
%patch1 -p0 -b .expat~
%patch3 -p0 -b .fortify
+%patch4 -p1 -b .nounidasm
# Create mess.ini file
cat > mess.ini << EOF
@@ -117,10 +115,13 @@
%build
+%if %{with debug}
make %{?_smp_mflags} %{?arch_flags} DEBUG=1 SYMBOLS=1 OPTIMIZE=2\
OPT_FLAGS='%{optflags} -DINI_PATH="\"%{_sysconfdir}/mess;\""' -f makefile.sdl
+%else
make %{?_smp_mflags} %{?arch_flags} SYMBOLS=1 OPTIMIZE=2\
OPT_FLAGS='%{optflags} -DINI_PATH="\"%{_sysconfdir}/mess;\""' -f makefile.sdl
+%endif
%install
@@ -148,8 +149,11 @@
install -d %{buildroot}%{_sysconfdir}/skel/.mess/snap
# Install binaries and config files
-install -pm 755 mess %{buildroot}%{_bindir}/mess
+%if %{with debug}
install -pm 755 messd %{buildroot}%{_bindir}/messd
+%else
+install -pm 755 mess %{buildroot}%{_bindir}/mess
+%endif
install -pm 755 castool imgtool messtest %{buildroot}%{_bindir}
install -pm 644 sysinfo.dat %{buildroot}%{_datadir}/mess
install -pm 644 artwork/* %{buildroot}%{_datadir}/mess/artwork
@@ -171,7 +175,11 @@
%doc *.txt docs/*
%config(noreplace) %{_sysconfdir}/mess/mess.ini
%dir %{_sysconfdir}/mess
+%if %{with debug}
+%{_bindir}/messd
+%else
%{_bindir}/mess
+%endif
%dir %{_datadir}/mess
%dir %{_datadir}/mess/artwork
%dir %{_datadir}/mess/roms
@@ -197,16 +205,13 @@
%{_datadir}/mess/ctrlr/*
%{_datadir}/mess/hash/*
-%files debug
-%defattr(-,root,root,-)
-%doc docs/license.txt
-%{_bindir}/messd
-
%changelog
* Thu Sep 17 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0134-1
- Updated to 0.134
- Updated the warnings patch
+- Made the -debug build optional
+- Disabled unidasm until MAME bug #3442 is fixed
* Fri Jul 24 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0133-1
- Updated to 0.133
14 years, 7 months
rpms/sdlmess/devel sdlmess-0134-nounidasm.patch, NONE, 1.1 sdlmess.spec, 1.14, 1.15
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/sdlmess/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv7856
Modified Files:
sdlmess.spec
Added Files:
sdlmess-0134-nounidasm.patch
Log Message:
Disabled unidasm until MAME bug #3442 is fixed
sdlmess-0134-nounidasm.patch:
--- NEW FILE sdlmess-0134-nounidasm.patch ---
diff -up sdlmess-0134/src/tools/tools.mak.nounidasm sdlmess-0134/src/tools/tools.mak
--- sdlmess-0134/src/tools/tools.mak.nounidasm 2009-09-10 15:45:02.000000000 +0200
+++ sdlmess-0134/src/tools/tools.mak 2009-09-17 18:05:12.000000000 +0200
@@ -26,7 +26,6 @@ TOOLS += \
romcmp$(EXE) \
chdman$(EXE) \
jedutil$(EXE) \
- unidasm$(EXE) \
ldresample$(EXE) \
ldverify$(EXE) \
regrep$(EXE) \
@@ -77,19 +76,6 @@ jedutil$(EXE): $(JEDUTILOBJS) $(LIBUTIL)
#-------------------------------------------------
-# unidasm
-#-------------------------------------------------
-
-UNIDASMOBJS = \
- $(TOOLSOBJ)/unidasm.o \
-
-unidasm$(EXE): $(UNIDASMOBJS) $(LIBUTIL) $(LIBOCORE) $(LIBDASM) $(ZLIB) $(EXPAT)
- @echo Linking $@...
- $(LD) $(LDFLAGS) $^ $(LIBS) -o $@
-
-
-
-#-------------------------------------------------
# ldresample
#-------------------------------------------------
Index: sdlmess.spec
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmess/devel/sdlmess.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sdlmess.spec 17 Sep 2009 15:45:13 -0000 1.14
+++ sdlmess.spec 17 Sep 2009 16:06:56 -0000 1.15
@@ -1,3 +1,7 @@
+# the debug build is disabled by default, please use --with debug to override
+%bcond_with debug
+
+
%ifarch x86_64
%define arch_flags PTR64=1
%endif
@@ -23,6 +27,7 @@
Patch0: %{name}-warnings.patch
Patch1: %{name}-expat.patch
Patch3: %{name}-fortify.patch
+Patch4: %{name}-0134-nounidasm.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL-devel expat-devel zlib-devel libGL-devel gtk2-devel unrar
@@ -57,19 +62,13 @@
%description data
%{summary}.
-%package debug
-Summary: Debug enabled version of sdlmess
-Group: Applications/Emulators
-
-%description debug
-%{summary}.
-
%prep
%setup -qn %{name}%{version}
%patch0 -p0 -b .warnings~
%patch1 -p0 -b .expat~
%patch3 -p0 -b .fortify
+%patch4 -p1 -b .nounidasm
# Create mess.ini file
cat > mess.ini << EOF
@@ -117,10 +116,13 @@
%build
-#make %{?_smp_mflags} %{?arch_flags} DEBUG=1 SYMBOLS=1 OPTIMIZE=2\
-# OPT_FLAGS='%{optflags} -DINI_PATH="\"%{_sysconfdir}/mess;\""' -f makefile.sdl
+%if %{with debug}
+make %{?_smp_mflags} %{?arch_flags} DEBUG=1 SYMBOLS=1 OPTIMIZE=2\
+ OPT_FLAGS='%{optflags} -DINI_PATH="\"%{_sysconfdir}/mess;\""' -f makefile.sdl
+%else
make %{?_smp_mflags} %{?arch_flags} SYMBOLS=1 OPTIMIZE=2\
OPT_FLAGS='%{optflags} -DINI_PATH="\"%{_sysconfdir}/mess;\""' -f makefile.sdl
+%endif
%install
@@ -148,8 +150,11 @@
install -d %{buildroot}%{_sysconfdir}/skel/.mess/snap
# Install binaries and config files
+%if %{with debug}
+install -pm 755 messd %{buildroot}%{_bindir}/messd
+%else
install -pm 755 mess %{buildroot}%{_bindir}/mess
-#install -pm 755 messd %{buildroot}%{_bindir}/messd
+%endif
install -pm 755 castool imgtool messtest %{buildroot}%{_bindir}
install -pm 644 sysinfo.dat %{buildroot}%{_datadir}/mess
install -pm 644 artwork/* %{buildroot}%{_datadir}/mess/artwork
@@ -171,7 +176,11 @@
%doc *.txt docs/*
%config(noreplace) %{_sysconfdir}/mess/mess.ini
%dir %{_sysconfdir}/mess
+%if %{with debug}
+%{_bindir}/messd
+%else
%{_bindir}/mess
+%endif
%dir %{_datadir}/mess
%dir %{_datadir}/mess/artwork
%dir %{_datadir}/mess/roms
@@ -197,16 +206,13 @@
%{_datadir}/mess/ctrlr/*
%{_datadir}/mess/hash/*
-#%files debug
-#%defattr(-,root,root,-)
-#%doc docs/license.txt
-#%{_bindir}/messd
-
%changelog
* Thu Sep 17 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0134-1
- Updated to 0.134
- Updated the warnings patch
+- Made the -debug build optional
+- Disabled unidasm until MAME bug #3442 is fixed
* Fri Jul 24 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0133-1
- Updated to 0.133
14 years, 7 months
rpms/sdlmess/devel sdlmess.spec,1.13,1.14
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/sdlmess/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv6647
Modified Files:
sdlmess.spec
Log Message:
Disabled the debug build
Index: sdlmess.spec
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmess/devel/sdlmess.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sdlmess.spec 17 Sep 2009 12:23:01 -0000 1.13
+++ sdlmess.spec 17 Sep 2009 15:45:13 -0000 1.14
@@ -117,8 +117,8 @@
%build
-make %{?_smp_mflags} %{?arch_flags} DEBUG=1 SYMBOLS=1 OPTIMIZE=2\
- OPT_FLAGS='%{optflags} -DINI_PATH="\"%{_sysconfdir}/mess;\""' -f makefile.sdl
+#make %{?_smp_mflags} %{?arch_flags} DEBUG=1 SYMBOLS=1 OPTIMIZE=2\
+# OPT_FLAGS='%{optflags} -DINI_PATH="\"%{_sysconfdir}/mess;\""' -f makefile.sdl
make %{?_smp_mflags} %{?arch_flags} SYMBOLS=1 OPTIMIZE=2\
OPT_FLAGS='%{optflags} -DINI_PATH="\"%{_sysconfdir}/mess;\""' -f makefile.sdl
@@ -149,7 +149,7 @@
# Install binaries and config files
install -pm 755 mess %{buildroot}%{_bindir}/mess
-install -pm 755 messd %{buildroot}%{_bindir}/messd
+#install -pm 755 messd %{buildroot}%{_bindir}/messd
install -pm 755 castool imgtool messtest %{buildroot}%{_bindir}
install -pm 644 sysinfo.dat %{buildroot}%{_datadir}/mess
install -pm 644 artwork/* %{buildroot}%{_datadir}/mess/artwork
@@ -197,10 +197,10 @@
%{_datadir}/mess/ctrlr/*
%{_datadir}/mess/hash/*
-%files debug
-%defattr(-,root,root,-)
-%doc docs/license.txt
-%{_bindir}/messd
+#%files debug
+#%defattr(-,root,root,-)
+#%doc docs/license.txt
+#%{_bindir}/messd
%changelog
14 years, 7 months
rpms/sdlmess/F-10 .cvsignore, 1.10, 1.11 sdlmess-warnings.patch, 1.2, 1.3 sdlmess.spec, 1.11, 1.12 sources, 1.10, 1.11
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/sdlmess/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27525
Modified Files:
.cvsignore sdlmess-warnings.patch sdlmess.spec sources
Log Message:
* Thu Sep 17 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0134-1
- Updated to 0.134
- Updated the warnings patch
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmess/F-10/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore 24 Jul 2009 08:47:47 -0000 1.10
+++ .cvsignore 17 Sep 2009 12:23:30 -0000 1.11
@@ -1,3 +1,3 @@
ui.bdc
ctrlr.rar
-sdlmess0133.zip
+sdlmess0134.zip
sdlmess-warnings.patch:
Index: sdlmess-warnings.patch
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmess/F-10/sdlmess-warnings.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sdlmess-warnings.patch 13 Mar 2009 19:11:06 -0000 1.2
+++ sdlmess-warnings.patch 17 Sep 2009 12:23:30 -0000 1.3
@@ -1,11 +1,11 @@
---- makefile.sdl.warnings~ 2009-03-13 17:53:53.000000000 +0100
-+++ makefile.sdl 2009-03-13 19:33:12.000000000 +0100
-@@ -337,7 +337,7 @@
- # and make all errors into warnings
+--- makefile.sdl.warnings~ 2009-09-17 02:49:53.000000000 +0200
++++ makefile.sdl 2009-09-17 13:51:15.000000000 +0200
+@@ -338,7 +338,7 @@
ifneq ($(OPTIMIZE),0)
ifneq ($(TARGETOS),os2)
+ ifndef IA64
-CCOMFLAGS += -Werror -fno-strict-aliasing $(ARCHOPTS)
+CCOMFLAGS += -fno-strict-aliasing $(ARCHOPTS)
else
- CCOMFLAGS += -fno-strict-aliasing $(ARCHOPTS)
endif
+ else
Index: sdlmess.spec
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmess/F-10/sdlmess.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sdlmess.spec 24 Jul 2009 08:47:47 -0000 1.11
+++ sdlmess.spec 17 Sep 2009 12:23:30 -0000 1.12
@@ -9,7 +9,7 @@
%endif
Name: sdlmess
-Version: 0133
+Version: 0134
Release: 1%{?dist}
Summary: SDL Multiple Emulator Super System
@@ -204,6 +204,10 @@
%changelog
+* Thu Sep 17 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0134-1
+- Updated to 0.134
+- Updated the warnings patch
+
* Fri Jul 24 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0133-1
- Updated to 0.133
- Made the -data subpackage noarch
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmess/F-10/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources 24 Jul 2009 08:47:47 -0000 1.10
+++ sources 17 Sep 2009 12:23:30 -0000 1.11
@@ -1,3 +1,3 @@
b64914c2a5589f6d5b00361464152acd ui.bdc
d907085f2f69b74198796378e3ed0cb3 ctrlr.rar
-bd847771a11343d2efb75335b973d646 sdlmess0133.zip
+1739f6b588ccaaddd67b8311f2981d68 sdlmess0134.zip
14 years, 7 months
rpms/sdlmess/F-11 .cvsignore, 1.10, 1.11 sdlmess-warnings.patch, 1.2, 1.3 sdlmess.spec, 1.12, 1.13 sources, 1.10, 1.11
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/sdlmess/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27423
Modified Files:
.cvsignore sdlmess-warnings.patch sdlmess.spec sources
Log Message:
* Thu Sep 17 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0134-1
- Updated to 0.134
- Updated the warnings patch
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmess/F-11/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore 24 Jul 2009 08:47:37 -0000 1.10
+++ .cvsignore 17 Sep 2009 12:23:15 -0000 1.11
@@ -1,3 +1,3 @@
ui.bdc
ctrlr.rar
-sdlmess0133.zip
+sdlmess0134.zip
sdlmess-warnings.patch:
Index: sdlmess-warnings.patch
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmess/F-11/sdlmess-warnings.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sdlmess-warnings.patch 13 Mar 2009 18:37:50 -0000 1.2
+++ sdlmess-warnings.patch 17 Sep 2009 12:23:15 -0000 1.3
@@ -1,11 +1,11 @@
---- makefile.sdl.warnings~ 2009-03-13 17:53:53.000000000 +0100
-+++ makefile.sdl 2009-03-13 19:33:12.000000000 +0100
-@@ -337,7 +337,7 @@
- # and make all errors into warnings
+--- makefile.sdl.warnings~ 2009-09-17 02:49:53.000000000 +0200
++++ makefile.sdl 2009-09-17 13:51:15.000000000 +0200
+@@ -338,7 +338,7 @@
ifneq ($(OPTIMIZE),0)
ifneq ($(TARGETOS),os2)
+ ifndef IA64
-CCOMFLAGS += -Werror -fno-strict-aliasing $(ARCHOPTS)
+CCOMFLAGS += -fno-strict-aliasing $(ARCHOPTS)
else
- CCOMFLAGS += -fno-strict-aliasing $(ARCHOPTS)
endif
+ else
Index: sdlmess.spec
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmess/F-11/sdlmess.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sdlmess.spec 24 Jul 2009 08:47:37 -0000 1.12
+++ sdlmess.spec 17 Sep 2009 12:23:15 -0000 1.13
@@ -9,7 +9,7 @@
%endif
Name: sdlmess
-Version: 0133
+Version: 0134
Release: 1%{?dist}
Summary: SDL Multiple Emulator Super System
@@ -204,6 +204,10 @@
%changelog
+* Thu Sep 17 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0134-1
+- Updated to 0.134
+- Updated the warnings patch
+
* Fri Jul 24 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0133-1
- Updated to 0.133
- Made the -data subpackage noarch
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmess/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources 24 Jul 2009 08:47:37 -0000 1.10
+++ sources 17 Sep 2009 12:23:15 -0000 1.11
@@ -1,3 +1,3 @@
b64914c2a5589f6d5b00361464152acd ui.bdc
d907085f2f69b74198796378e3ed0cb3 ctrlr.rar
-bd847771a11343d2efb75335b973d646 sdlmess0133.zip
+1739f6b588ccaaddd67b8311f2981d68 sdlmess0134.zip
14 years, 7 months
rpms/sdlmess/devel .cvsignore, 1.10, 1.11 sdlmess-warnings.patch, 1.2, 1.3 sdlmess.spec, 1.12, 1.13 sources, 1.10, 1.11
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/sdlmess/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27311
Modified Files:
.cvsignore sdlmess-warnings.patch sdlmess.spec sources
Log Message:
* Thu Sep 17 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0134-1
- Updated to 0.134
- Updated the warnings patch
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmess/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore 24 Jul 2009 08:47:27 -0000 1.10
+++ .cvsignore 17 Sep 2009 12:23:01 -0000 1.11
@@ -1,3 +1,3 @@
ui.bdc
ctrlr.rar
-sdlmess0133.zip
+sdlmess0134.zip
sdlmess-warnings.patch:
Index: sdlmess-warnings.patch
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmess/devel/sdlmess-warnings.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sdlmess-warnings.patch 13 Mar 2009 18:37:50 -0000 1.2
+++ sdlmess-warnings.patch 17 Sep 2009 12:23:01 -0000 1.3
@@ -1,11 +1,11 @@
---- makefile.sdl.warnings~ 2009-03-13 17:53:53.000000000 +0100
-+++ makefile.sdl 2009-03-13 19:33:12.000000000 +0100
-@@ -337,7 +337,7 @@
- # and make all errors into warnings
+--- makefile.sdl.warnings~ 2009-09-17 02:49:53.000000000 +0200
++++ makefile.sdl 2009-09-17 13:51:15.000000000 +0200
+@@ -338,7 +338,7 @@
ifneq ($(OPTIMIZE),0)
ifneq ($(TARGETOS),os2)
+ ifndef IA64
-CCOMFLAGS += -Werror -fno-strict-aliasing $(ARCHOPTS)
+CCOMFLAGS += -fno-strict-aliasing $(ARCHOPTS)
else
- CCOMFLAGS += -fno-strict-aliasing $(ARCHOPTS)
endif
+ else
Index: sdlmess.spec
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmess/devel/sdlmess.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sdlmess.spec 24 Jul 2009 08:47:27 -0000 1.12
+++ sdlmess.spec 17 Sep 2009 12:23:01 -0000 1.13
@@ -9,7 +9,7 @@
%endif
Name: sdlmess
-Version: 0133
+Version: 0134
Release: 1%{?dist}
Summary: SDL Multiple Emulator Super System
@@ -204,6 +204,10 @@
%changelog
+* Thu Sep 17 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0134-1
+- Updated to 0.134
+- Updated the warnings patch
+
* Fri Jul 24 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0133-1
- Updated to 0.133
- Made the -data subpackage noarch
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmess/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources 24 Jul 2009 08:47:27 -0000 1.10
+++ sources 17 Sep 2009 12:23:01 -0000 1.11
@@ -1,3 +1,3 @@
b64914c2a5589f6d5b00361464152acd ui.bdc
d907085f2f69b74198796378e3ed0cb3 ctrlr.rar
-bd847771a11343d2efb75335b973d646 sdlmess0133.zip
+1739f6b588ccaaddd67b8311f2981d68 sdlmess0134.zip
14 years, 7 months
rpms/sdlmame-data/F-10 .cvsignore, 1.12, 1.13 sdlmame-data.spec, 1.13, 1.14 sources, 1.12, 1.13
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/sdlmame-data/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24388
Modified Files:
.cvsignore sdlmame-data.spec sources
Log Message:
* Thu Sep 17 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0134-1
- Updated to 0.134
- Switched to 7z sources for history.dat
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame-data/F-10/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore 3 Aug 2009 14:12:01 -0000 1.12
+++ .cvsignore 17 Sep 2009 11:30:46 -0000 1.13
@@ -1,6 +1,6 @@
ctrlr.rar
catveren.zip
-cheat0132.7z
-mamehistory133.zip
-Mameinfo0133.zip
-nplayers0133.zip
+cheat0134.7z
+mamehistory134.7z
+Mameinfo0134.zip
+nplayers0134.zip
Index: sdlmame-data.spec
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame-data/F-10/sdlmame-data.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sdlmame-data.spec 3 Aug 2009 14:12:01 -0000 1.13
+++ sdlmame-data.spec 17 Sep 2009 11:30:46 -0000 1.14
@@ -1,4 +1,4 @@
-%define vernumber 133
+%define vernumber 134
Name: sdlmame-data
Version: 0%{vernumber}
@@ -8,12 +8,12 @@
Group: Amusements/Games
License: Distibutable
URL: http://mamedev.org
-Source1: http://www.arcade-history.com/dats/mamehistory%{vernumber}.zip
+Source1: http://www.arcade-history.com/dats/mamehistory%{vernumber}.7z
Source2: http://www.mameworld.info/mameinfo/update/Mameinfo%{version}.zip
Source3: http://www.kutek.net/mame_roms_pinball/mame32_config_files/ctrlr.rar
Source4: http://www.progettoemma.net/public/cat/catveren.zip
Source5: http://nplayers.arcadebelgium.be/files/nplayers%{version}.zip
-Source6: http://http://cheat.retrogames.com/download/cheat0132.7z
+Source6: http://http://cheat.retrogames.com/download/cheat%{version}.7z
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -30,7 +30,7 @@
%setup -qcT
# extract DAT files
-unzip -qa %{SOURCE1} -d .
+7za x %{SOURCE1}
7za x %{SOURCE2}
7za x Mameinfo%{version}.exe
mv docs mameinfo
@@ -58,7 +58,7 @@
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_datadir}/mame
-install -pm 644 history.dat mameinfo.dat Catver.ini nplayers.ini cheat.zip\
+install -pm 644 history.dat mameinfo.dat catveren/Catver.ini nplayers.ini cheat.zip\
$RPM_BUILD_ROOT%{_datadir}/mame
install -d $RPM_BUILD_ROOT%{_datadir}/mame/ctrlr
unrar x %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/mame
@@ -70,11 +70,15 @@
%files
%defattr(-,root,root,-)
-%doc nplayers/nplayers.txt mameinfo cheat.txt
+%doc catveren/readme.txt nplayers/nplayers.txt mameinfo cheat.txt readhist.txt
%{_datadir}/mame
%changelog
+* Thu Sep 17 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0134-1
+- Updated to 0.134
+- Switched to 7z sources for history.dat
+
* Mon Aug 03 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0133-1
- Updated everything except cheats to 0.133
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame-data/F-10/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 3 Aug 2009 14:12:01 -0000 1.12
+++ sources 17 Sep 2009 11:30:46 -0000 1.13
@@ -1,6 +1,6 @@
d907085f2f69b74198796378e3ed0cb3 ctrlr.rar
-966048d6090083e345b8f8326a2da521 cheat0132.7z
-fa7f3fd2920bd40fe41cec2f8ab9694e catveren.zip
-9e88ca4c1fb724a1af56ae64559bc4ab mamehistory133.zip
-105a8a81e199d89b10a39a76dd02f579 Mameinfo0133.zip
-6b13df04b1416221fa0cffe6cddf593f nplayers0133.zip
+64951218c1e0a801e9a2b150ed7ff77b catveren.zip
+b0b038506fdf648ce714193a80ddda44 cheat0134.7z
+581de6bb366e61629d580689d337a431 mamehistory134.7z
+8e5a0633084e860562ac64c6bee14a0f Mameinfo0134.zip
+1e4380586ca775fd4e617cb76caa318f nplayers0134.zip
14 years, 7 months
rpms/sdlmame-data/F-11 .cvsignore, 1.12, 1.13 sdlmame-data.spec, 1.15, 1.16 sources, 1.12, 1.13
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/sdlmame-data/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24286
Modified Files:
.cvsignore sdlmame-data.spec sources
Log Message:
* Thu Sep 17 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0134-1
- Updated to 0.134
- Switched to 7z sources for history.dat
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame-data/F-11/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore 3 Aug 2009 14:11:49 -0000 1.12
+++ .cvsignore 17 Sep 2009 11:30:38 -0000 1.13
@@ -1,6 +1,6 @@
ctrlr.rar
catveren.zip
-cheat0132.7z
-mamehistory133.zip
-Mameinfo0133.zip
-nplayers0133.zip
+cheat0134.7z
+mamehistory134.7z
+Mameinfo0134.zip
+nplayers0134.zip
Index: sdlmame-data.spec
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame-data/F-11/sdlmame-data.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sdlmame-data.spec 3 Aug 2009 14:11:49 -0000 1.15
+++ sdlmame-data.spec 17 Sep 2009 11:30:38 -0000 1.16
@@ -1,4 +1,4 @@
-%define vernumber 133
+%define vernumber 134
Name: sdlmame-data
Version: 0%{vernumber}
@@ -8,12 +8,12 @@
Group: Amusements/Games
License: Distibutable
URL: http://mamedev.org
-Source1: http://www.arcade-history.com/dats/mamehistory%{vernumber}.zip
+Source1: http://www.arcade-history.com/dats/mamehistory%{vernumber}.7z
Source2: http://www.mameworld.info/mameinfo/update/Mameinfo%{version}.zip
Source3: http://www.kutek.net/mame_roms_pinball/mame32_config_files/ctrlr.rar
Source4: http://www.progettoemma.net/public/cat/catveren.zip
Source5: http://nplayers.arcadebelgium.be/files/nplayers%{version}.zip
-Source6: http://http://cheat.retrogames.com/download/cheat0132.7z
+Source6: http://http://cheat.retrogames.com/download/cheat%{version}.7z
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -30,7 +30,7 @@
%setup -qcT
# extract DAT files
-unzip -qa %{SOURCE1} -d .
+7za x %{SOURCE1}
7za x %{SOURCE2}
7za x Mameinfo%{version}.exe
mv docs mameinfo
@@ -58,7 +58,7 @@
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_datadir}/mame
-install -pm 644 history.dat mameinfo.dat Catver.ini nplayers.ini cheat.zip\
+install -pm 644 history.dat mameinfo.dat catveren/Catver.ini nplayers.ini cheat.zip\
$RPM_BUILD_ROOT%{_datadir}/mame
install -d $RPM_BUILD_ROOT%{_datadir}/mame/ctrlr
unrar x %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/mame
@@ -70,11 +70,15 @@
%files
%defattr(-,root,root,-)
-%doc nplayers/nplayers.txt mameinfo cheat.txt
+%doc catveren/readme.txt nplayers/nplayers.txt mameinfo cheat.txt readhist.txt
%{_datadir}/mame
%changelog
+* Thu Sep 17 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0134-1
+- Updated to 0.134
+- Switched to 7z sources for history.dat
+
* Mon Aug 03 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0133-1
- Updated everything except cheats to 0.133
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame-data/F-11/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 3 Aug 2009 14:11:49 -0000 1.12
+++ sources 17 Sep 2009 11:30:38 -0000 1.13
@@ -1,6 +1,6 @@
d907085f2f69b74198796378e3ed0cb3 ctrlr.rar
-966048d6090083e345b8f8326a2da521 cheat0132.7z
-fa7f3fd2920bd40fe41cec2f8ab9694e catveren.zip
-9e88ca4c1fb724a1af56ae64559bc4ab mamehistory133.zip
-105a8a81e199d89b10a39a76dd02f579 Mameinfo0133.zip
-6b13df04b1416221fa0cffe6cddf593f nplayers0133.zip
+64951218c1e0a801e9a2b150ed7ff77b catveren.zip
+b0b038506fdf648ce714193a80ddda44 cheat0134.7z
+581de6bb366e61629d580689d337a431 mamehistory134.7z
+8e5a0633084e860562ac64c6bee14a0f Mameinfo0134.zip
+1e4380586ca775fd4e617cb76caa318f nplayers0134.zip
14 years, 7 months