rpms/transcode/F-8 transcode-1.0.2-lzo2.patch, NONE, 1.1 transcode-1.0.4-shared_libmpeg3.patch, NONE, 1.1 transcode-1.0.4.dep-cleanup.patch, NONE, 1.1 transcode-1.0.4.external_dv.patch, NONE, 1.1 transcode-pvmbin.patch, NONE, 1.1 transcode.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by David Juran
Author: juran
Update of /cvs/free/rpms/transcode/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv14050/F-8
Modified Files:
.cvsignore sources
Added Files:
transcode-1.0.2-lzo2.patch
transcode-1.0.4-shared_libmpeg3.patch
transcode-1.0.4.dep-cleanup.patch
transcode-1.0.4.external_dv.patch transcode-pvmbin.patch
transcode.spec
Log Message:
Initial import
transcode-1.0.2-lzo2.patch:
--- NEW FILE transcode-1.0.2-lzo2.patch ---
--- transcode-1.0.2/import/import_lzo.c~ 2005-07-04 10:09:33.000000000 +0300
+++ transcode-1.0.2/import/import_lzo.c 2006-07-26 20:50:50.000000000 +0300
@@ -22,10 +22,12 @@
*/
#define MOD_NAME "import_lzo.so"
-#define MOD_VERSION "v0.0.3 (2002-11-26)"
+#define MOD_VERSION "v0.1.0 (2005-10-16)"
#define MOD_CODEC "(video) LZO"
#include "transcode.h"
+#include "magic.h"
+#include "export/tc_lzo.h"
static int verbose_flag = TC_QUIET;
static int capability_flag = TC_CAP_PCM | TC_CAP_YUV | TC_CAP_RGB |
@@ -34,15 +36,14 @@
#define MOD_PRE lzo
#include "import_def.h"
-#include <lzo1x.h>
-#if (LZO_VERSION > 0x1070)
-# include <lzoutil.h>
-#endif
+#include <lzo/lzo1x.h>
+#include <lzo/lzoutil.h>
static avi_t *avifile1=NULL;
static avi_t *avifile2=NULL;
+static uint32_t video_codec;
static int audio_codec;
static int aframe_count=0, vframe_count=0;
@@ -103,6 +104,14 @@
fps = AVI_frame_rate(avifile2);
codec = AVI_video_compressor(avifile2);
+ if (strcmp(codec,"LZO1") == 0) {
+ video_codec = TC_CODEC_LZO1;
+ } else if (strcmp(codec,"LZO2") == 0) {
+ video_codec = TC_CODEC_LZO2;
+ } else {
+ fprintf(stderr, "[%s] Unsupported video codec %s", MOD_NAME, codec);
+ return(TC_IMPORT_ERROR);
+ }
fprintf(stderr, "[%s] codec=%s, fps=%6.3f, width=%d, height=%d\n",
MOD_NAME, codec, fps, width, height);
@@ -142,7 +151,7 @@
{
int key;
-
+ lzo_uint size;
long bytes_read=0;
if(param->flag == TC_VIDEO) {
@@ -160,7 +169,24 @@
return(TC_IMPORT_ERROR);
}
- r = lzo1x_decompress(out, out_len, param->buffer, ¶m->size, wrkmem);
+ if (video_codec == TC_CODEC_LZO1) {
+ r = lzo1x_decompress(out, out_len, param->buffer, &size, wrkmem);
+ } else {
+ tc_lzo_header_t *h = (tc_lzo_header_t *)out;
+ uint8_t *compdata = out + sizeof(*h);
+ int compsize = out_len - sizeof(*h);
+ if (h->magic != video_codec) {
+ fprintf(stderr, "[%s] frame with invalid magic 0x%08X\n", MOD_NAME, h->magic);
+ return (TC_IMPORT_ERROR);
+ }
+ if (h->flags & TC_LZO_NOT_COMPRESSIBLE) {
+ tc_memcpy(param->buffer, compdata, compsize);
+ size = compsize;
+ r = LZO_E_OK;
+ } else {
+ r = lzo1x_decompress(compdata, compsize, param->buffer, &size, wrkmem);
+ }
+ }
if (r == LZO_E_OK) {
if(verbose & TC_DEBUG) printf("decompressed %lu bytes into %lu bytes\n",
@@ -172,6 +198,7 @@
return(TC_IMPORT_ERROR);
}
+ param->size = size;
//transcode v.0.5.0-pre8 addition
if(key) param->attributes |= TC_FRAME_IS_KEYFRAME;
--- transcode-1.0.2/import/decode_lzo.c~ 2005-07-04 10:09:33.000000000 +0300
+++ transcode-1.0.2/import/decode_lzo.c 2006-07-26 20:50:55.000000000 +0300
@@ -27,10 +27,8 @@
#ifdef HAVE_LZO
-#include <lzo1x.h>
-#if (LZO_VERSION > 0x1070)
-# include <lzoutil.h>
-#endif
+#include <lzo/lzo1x.h>
+#include <lzo/lzoutil.h>
#include "export/tc_lzo.h"
@@ -100,8 +98,13 @@
goto decoder_error;
}
-
- r = lzo1x_decompress(inbuf, bytes, out, &out_len, wrkmem);
+ if (h.flags & TC_LZO_NOT_COMPRESSIBLE) {
+ tc_memcpy(out, inbuf, bytes);
+ out_len = bytes;
+ r = LZO_E_OK;
+ } else {
+ r = lzo1x_decompress(inbuf, bytes, out, &out_len, wrkmem);
+ }
if (r == LZO_E_OK) {
if(verbose & TC_DEBUG)
--- transcode-1.0.2/import/extract_lzo.c~ 2005-07-04 10:09:33.000000000 +0300
+++ transcode-1.0.2/import/extract_lzo.c 2006-07-26 20:50:52.000000000 +0300
@@ -27,10 +27,8 @@
#ifdef HAVE_LZO
-#include <lzo1x.h>
-#if (LZO_VERSION > 0x1070)
-# include <lzoutil.h>
-#endif
+#include <lzo/lzo1x.h>
+#include <lzo/lzoutil.h>
#define BUFFER_SIZE SIZE_RGB_FRAME<<1
--- transcode-1.0.2/configure.in~ 2005-10-30 06:57:45.000000000 +0200
+++ transcode-1.0.2/configure.in 2006-07-26 20:51:02.000000000 +0300
@@ -1018,7 +1018,7 @@
dnl
dnl LZO
dnl
-TC_PKG_CHECK(lzo, no, LZO, no, [lzo1x.h], lzo, lzo_version, lzo,
+TC_PKG_CHECK(lzo, no, LZO, no, [lzo/lzo1x.h], lzo2, lzo_version, lzo,
[http://www.oberhumer.com/opensource/lzo/])
TC_PKG_HAVE(lzo, LZO)
--- transcode-1.0.2/export/tc_lzo.h~ 2005-07-04 10:15:57.000000000 +0300
+++ transcode-1.0.2/export/tc_lzo.h 2006-07-26 20:50:58.000000000 +0300
@@ -1,7 +1,6 @@
#ifndef TC_LZO_H
#define TC_LZO_H
-#define TC_LZO_MAGIC 0x4C5A4F32 /* LZO2 */
#define TC_LZO_FORMAT_YV12 1
#define TC_LZO_FORMAT_RGB24 2
@@ -14,6 +13,7 @@
unsigned int flags;
unsigned char method; /* compression method */
unsigned char level; /* compression level */
+ short pad;
} tc_lzo_header_t;
#endif /* TC_LZO_H */
--- transcode-1.0.2/export/export_lzo.c~ 2005-07-04 10:09:31.000000000 +0300
+++ transcode-1.0.2/export/export_lzo.c 2006-07-26 20:51:00.000000000 +0300
@@ -29,20 +29,13 @@
#include "aud_aux.h"
#include "import/magic.h"
-#include <lzo1x.h>
-#if (LZO_VERSION > 0x1070)
-# include <lzoutil.h>
-#endif
+#include <lzo/lzo1x.h>
+#include <lzo/lzoutil.h>
-#define LZO2 1
-#undef LZO2
-
-#ifdef LZO2
#include "tc_lzo.h"
-#endif
#define MOD_NAME "export_lzo.so"
-#define MOD_VERSION "v0.0.6 (2003-07-24)"
+#define MOD_VERSION "v0.1.0 (2005-10-15)"
#define MOD_CODEC "(video) LZO real-time compression | (audio) MPEG/AC3/PCM"
static int verbose_flag=TC_QUIET;
@@ -129,23 +122,14 @@
//force keyframe
force_kf=1;
-#ifdef LZO2
AVI_set_video(vob->avifile_out, vob->ex_v_width, vob->ex_v_height, vob->ex_fps, "LZO2");
-#else
- AVI_set_video(vob->avifile_out, vob->ex_v_width, vob->ex_v_height, vob->ex_fps, "LZO1");
-#endif
if (vob->avi_comment_fd>0)
AVI_set_comment_fd(vob->avifile_out, vob->avi_comment_fd);
if(!info_shown && verbose_flag)
-#ifdef LZO2
fprintf(stderr, "[%s] codec=%s, fps=%6.3f, width=%d, height=%d\n",
MOD_NAME, "LZO2", vob->ex_fps, vob->ex_v_width, vob->ex_v_height);
-#else
- fprintf(stderr, "[%s] codec=%s, fps=%6.3f, width=%d, height=%d\n",
- MOD_NAME, "LZO1", vob->ex_fps, vob->ex_v_width, vob->ex_v_height);
-#endif
info_shown=1;
@@ -183,9 +167,7 @@
int key;
-#ifdef LZO2
tc_lzo_header_t h;
-#endif
if(param->flag == TC_VIDEO) {
@@ -197,7 +179,6 @@
* compress from `in' to `out' with LZO1X-1
*/
-#ifdef LZO2
r = lzo1x_1_compress(param->buffer, param->size, out+sizeof(h), &out_len, wrkmem);
h.magic = TC_CODEC_LZO2;
h.size = out_len;
@@ -205,12 +186,9 @@
h.level = 1;
h.flags = 0;
h.flags |= ((codec==CODEC_RGB)?TC_LZO_FORMAT_RGB24:TC_LZO_FORMAT_YV12);
+ h.pad = 0;
- // XXX
tc_memcpy (out, &h, sizeof(h));
-#else
- r = lzo1x_1_compress(param->buffer, param->size, out, &out_len, wrkmem);
-#endif
if (r == LZO_E_OK) {
if(verbose & TC_DEBUG) printf("compressed %lu bytes into %lu bytes\n",
@@ -225,17 +203,15 @@
/* check for an incompressible block */
if (out_len >= param->size) {
if(verbose & TC_DEBUG) printf("[%s] block contains incompressible data\n", MOD_NAME);
-#ifdef LZO2
h.flags |= TC_LZO_NOT_COMPRESSIBLE;
-#endif
+ tc_memcpy(out+sizeof(h), param->buffer, param->size);
+ out_len = param->size;
}
//0.5.0-pre8:
key = ((param->attributes & TC_FRAME_IS_KEYFRAME) || force_kf) ? 1:0;
-#ifdef LZO2
out_len += sizeof(h);
-#endif
//0.6.2: switch outfile on "C" and -J pv
//0.6.2: enforce auto-split at 2G (or user value) for normal AVI files
transcode-1.0.4-shared_libmpeg3.patch:
--- NEW FILE transcode-1.0.4-shared_libmpeg3.patch ---
diff -up transcode-1.0.4/configure.in.libmpeg3 transcode-1.0.4/configure.in
--- transcode-1.0.4/configure.in.libmpeg3 2007-10-12 00:09:23.000000000 +0200
+++ transcode-1.0.4/configure.in 2007-10-12 00:19:53.000000000 +0200
@@ -1065,19 +1065,19 @@ if test x"$have_libmpeg3" = x"yes" ; the
libmpeg3_inc="no"
save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $libmpeg3_ii"
+ AC_CHECK_HEADER([libmpeg3.h],
+ [LIBMPEG3_CFLAGS="$libmpeg3_ii"
+ libmpeg3_inc="yes"])
+ if test x"$libmpeg3_inc" = x"no" ; then
AC_CHECK_HEADER([libmpeg3/libmpeg3.h],
[LIBMPEG3_CFLAGS="$libmpeg3_ii/libmpeg3"
libmpeg3_inc="yes"])
+ fi
if test x"$libmpeg3_inc" = x"no" ; then
AC_CHECK_HEADER([mpeg3/libmpeg3.h],
[LIBMPEG3_CFLAGS="$libmpeg3_ii/mpeg3"
libmpeg3_inc="yes"])
fi
- if test x"$libmpeg3_inc" = x"no" ; then
- AC_CHECK_HEADER([libmpeg3.h],
- [LIBMPEG3_CFLAGS="$libmpeg3_ii"
- libmpeg3_inc="yes"])
- fi
CPPFLAGS="$save_CPPFLAGS"
if test x"$libmpeg3_inc" = x"no" ; then
have_libmpeg3="no"
transcode-1.0.4.dep-cleanup.patch:
--- NEW FILE transcode-1.0.4.dep-cleanup.patch ---
diff -up transcode-1.0.4/configure.in.original transcode-1.0.4/configure.in
--- transcode-1.0.4/configure.in.original 2007-09-29 22:25:45.000000000 +0300
+++ transcode-1.0.4/configure.in 2007-09-29 22:26:34.000000000 +0300
@@ -1008,7 +1008,7 @@ TC_PKG_HAVE(libdv, LIBDV)
dnl
dnl libquicktime
dnl
-LIBQUICKTIME_EXTRA_LIBS="$LIBQUICKTIME_EXTRA_LIBS -lpng -lz $PTHREAD_LIBS -lm $LIBDV_LIBS"
+LIBQUICKTIME_EXTRA_LIBS="$LIBQUICKTIME_EXTRA_LIBS -lz $PTHREAD_LIBS -lm $LIBDV_LIBS"
TC_PKG_CHECK(libquicktime, no, LIBQUICKTIME, lqt-config, [quicktime.h],
quicktime, lqt_rows_alloc, libquicktime,
[http://libquicktime.sourceforge.net/])
transcode-1.0.4.external_dv.patch:
--- NEW FILE transcode-1.0.4.external_dv.patch ---
diff -up transcode-1.0.4/filter/preview/Makefile.am.original transcode-1.0.4/filter/preview/Makefile.am
--- transcode-1.0.4/filter/preview/Makefile.am.original 2007-09-28 22:19:51.000000000 +0300
+++ transcode-1.0.4/filter/preview/Makefile.am 2007-09-28 22:23:12.000000000 +0300
@@ -53,7 +53,6 @@ filter_pv_la_LIBADD = \
EXTRA_DIST = \
display.h \
- dv_types.h \
filter_preview.h \
font_xpm.h \
pv.h
Only in transcode-1.0.4.original/filter/preview: dv_types.h
transcode-pvmbin.patch:
--- NEW FILE transcode-pvmbin.patch ---
--- transcode-1.0.0/pvm3/Makefile.in.pvmbin 2005-07-12 10:40:55.000000000 +0300
+++ transcode-1.0.0/pvm3/Makefile.in 2005-07-21 19:41:14.000000000 +0300
@@ -763,11 +763,6 @@
uninstall-info-am uninstall-pkgLTLIBRARIES
-install-data-local:
- @$(NORMAL_INSTALL)
- if test ! -e $(bindir)/pvmgs; then \
- ln -s $(PVM3_PVMGS) $(bindir)/pvmgs; \
- fi;
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
--- transcode-1.0.0/pvm3/Makefile.am.pvmbin 2005-07-12 10:25:16.000000000 +0300
+++ transcode-1.0.0/pvm3/Makefile.am 2005-07-21 19:41:35.000000000 +0300
@@ -43,8 +43,3 @@
pvm_version.h \
vob_pack_unpack.h
-install-data-local:
- @$(NORMAL_INSTALL)
- if test ! -e $(bindir)/pvmgs; then \
- ln -s $(PVM3_PVMGS) $(bindir)/pvmgs; \
- fi;
--- NEW FILE transcode.spec ---
# TODO (sometime, maybe):
# - avifile (ick): http://avifile.sourceforge.net/
# - LoRS/IBP: http://loci.cs.utk.edu/
# I bet this _will_ change in the future.
%define pvmdir %{_datadir}/pvm3
Name: transcode
Version: 1.0.4
Release: 5%{?dist}
Summary: Video stream processing tool
Group: Applications/Multimedia
License: GPLv2+
URL: http://www.transcoding.org/
Source0: http://fromani.exit1.org/%{name}-%{version}.tar.bz2
Patch0: %{name}-pvmbin.patch
Patch2: %{name}-1.0.2-lzo2.patch
Patch3: transcode-1.0.4.external_dv.patch
Patch4: transcode-1.0.4.dep-cleanup.patch
Patch5: transcode-1.0.4-shared_libmpeg3.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libogg-devel
BuildRequires: libvorbis-devel
BuildRequires: libdvdread-devel
BuildRequires: a52dec-devel
BuildRequires: libxml2-devel
BuildRequires: libjpeg-devel
BuildRequires: lzo-devel >= 2
BuildRequires: mjpegtools-devel
BuildRequires: libdv-devel
BuildRequires: xvidcore-devel
BuildRequires: libquicktime-devel >= 0.9.8
BuildRequires: lame-devel >= 3.89
BuildRequires: SDL-devel >= 1.1.6
BuildRequires: ffmpeg-devel >= 0.4.9
BuildRequires: mpeg2dec-devel >= 0.4.0-0.lvn.3.b
BuildRequires: pvm
BuildRequires: libtheora-devel
BuildRequires: libXv-devel
BuildRequires: libXaw-devel
BuildRequires: libXpm-devel
BuildRequires: freetype-devel
%ifarch %{ix86}
BuildRequires: nasm
%endif
BuildRequires: ImageMagick-devel >= 5.4.3
BuildRequires: libmpeg3-devel
# libtool + autotools for patch2, autoreconf
BuildRequires: libtool
Requires: xvidcore
%description
transcode is a text console video-stream processing tool. It supports
elementary video and audio frame transformations. Some example modules
are included to enable import of MPEG-1/2, Digital Video, and other
formats. It also includes export modules for writing to AVI files with
DivX, OpenDivX, XviD, Digital Video or other codecs. Direct DVD
transcoding is also supported. A set of tools is available to extract
and decode the sources into raw video/audio streams for import and to
enable post-processing of AVI files.
%prep
%setup -q
%patch0 -p1 -b .pvmbin
%patch2 -p1 -b .lzo
%patch3 -p1 -b .external_dv
rm filter/preview/dv_types.h
%patch4 -p1 -b .dep-cleanup
%patch5 -p1 -b .shared-libmpeg3
%build
autoreconf # for patch2, and fixes standard rpaths on lib64 archs
for file in docs/{man/*.1,export_mp2.txt,export_mpeg.txt,filter_dnr.txt} \
AUTHORS ChangeLog README docs/README.vcd ; do
iconv -f iso-8859-1 -t utf-8 $file > $file.utf8 && mv -f $file.utf8 $file
done
%configure \
--disable-dependency-tracking \
--with-x \
--enable-netstream \
--enable-v4l \
--enable-oss \
--enable-libpostproc \
--with-libpostproc-includes=%{_includedir}/postproc \
--enable-freetype2 \
--enable-ogg \
--enable-vorbis \
--enable-theora \
--enable-pvm3 \
--with-pvm3-libs=`ls -1d %{pvmdir}/lib/LINUX*` \
--with-pvm3-includes=%{pvmdir}/include \
--enable-libdv \
--enable-libquicktime \
--enable-lzo \
--enable-a52 \
--enable-a52-default-decoder \
--enable-libxml2 \
--enable-mjpegtools \
--enable-sdl \
--enable-imagemagick \
--enable-libmpeg3
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT __documentation
make install DESTDIR=$RPM_BUILD_ROOT
mv $RPM_BUILD_ROOT%{_docdir}/transcode/ __documentation
rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README* TODO __documentation/*
%{_bindir}/*
%{_libdir}/%{name}
%{_mandir}/man1/*.1*
%changelog
* Tue Oct 16 2007 David Juran <david(a)juran.se> - 1.0.4-5
- use shared libmpeg3
- use a52dec default decoder as recommended
- License is GPLv2+
* Mon Oct 8 2007 David Juran <david(a)juran.se> - 1.0.4-4
- enable libmpeg3 for rpmfusion
* Sat Sep 29 2007 David Juran <david(a)juran.se> - 1.0.4-3
- Drop indirect dependencies
* Fri Sep 28 2007 David Juran <david(a)juran.se> - 1.0.4-2
- Get rid of glib dependency
* Mon Sep 24 2007 David Juran <david(a)juran.se> - 1.0.4-1
- updated to 1.0.4
* Fri Jun 8 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.0.3-1
- 1.0.3.
- Convert more docs to UTF-8.
* Fri Oct 06 2006 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 1.0.2-12
- rebuilt for unwind info generation, broken in gcc-4.1.1-21
* Mon Sep 25 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0.2-11
- Fix build with recent ffmpeg.
- Don't build with libfame.
- Specfile cleanup.
* Wed Jul 26 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0.2-10
- Backport upstream changes for lzo2, require it.
- Apply upstream fix for compare filter never returning (#987).
- Avoid standard rpaths on lib64 archs.
* Wed Jul 19 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0.2-4
- Rebuild for new ImageMagick (#1066).
- Fix some cosmetic rpmlint warnings.
* Sat Apr 8 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0.2-3
- Rebuild for new ffmpeg.
* Tue Mar 14 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> 1.0.2-2
- drop "0.lvn" from release
* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- add dist
* Thu Jan 5 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0.2-0.lvn.2
- 1.0.2, libquicktime detection/build fixed upstream.
- Rebuild against new ffmpeg.
- Drop zero Epochs.
- Adapt to modular X.
* Sat Oct 8 2005 Dams <anvil[AT]livna.org> - 0:1.0.0-0.lvn.4
- Really rebuilding against new mjpegtools
* Mon Sep 26 2005 Thorsten Leemhuis <fedoral[AT]leemhuis.info> - 0:1.0.0-0.lvn.3
- Rebuilt against new mjpegtools
* Tue Aug 30 2005 Dams <anvil[AT]livna.org> - 0:1.0.0-0.lvn.2
- Rebuilt against new mjpegtools
* Thu Jul 21 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:1.0.0-0.lvn.1
- 1.0.0, no more SSE/gcc4 special casing needed, pvmlink patch applied upstream
* Tue Jul 5 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:1.0.0-0.lvn.0.4.rc1
- 1.0.0rc1, gcc4 patch no longer needed (but SSE/gcc4 problems persist).
- Add upstream patch to fix PVM linking.
- Clean up obsolete pre-FC2 support.
* Sat Jun 18 2005 Ville Skyttä <ville.skytta at iki.fi> 0:1.0.0-0.lvn.0.3.beta3
- Add "--without sse" rpmbuild option, needed with gcc4.
* Mon Jun 06 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:1.0.0-0.lvn.0.2.beta3
- Add gcc4.patch from plf-package with a small addition from cvs
* Sun May 1 2005 Ville Skyttä <ville.skytta at iki.fi> 0:1.0.0-0.lvn.0.1.beta3
- 1.0.0beta3.
- Enable PVM support.
* Sun Feb 20 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.6.14-0.lvn.5
- Requires: xvidcore.
* Thu Jan 13 2005 Dams <anvil[AT]livna.org> - 0:0.6.14-0.lvn.4
- buildroot -> RPM_BUILD_ROOT, for consistency
* Sun Jan 02 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:0.6.14-0.lvn.3
- Use --with-mod-path={_libdir}/transcode on x86_64
- use make install DESTDIR=%%{buildroot} instead makeinstall; adjust doc-install
* Thu Dec 23 2004 Dams <anvil[AT]livna.org> - 0:0.6.14-0.lvn.2
- Workaround for bad Magick-config
* Tue Dec 14 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.6.14-0.lvn.1
- Update to 0.6.14.
- Build with whatever the compiler supports; CPU features detected at runtime.
- Build with dependency tracking disabled.
* Thu Jul 29 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.6.12-0.lvn.5
- Remove ffmpeg-devel and libpostproc-devel build deps, transcode uses its
internal ones.
* Tue Jul 27 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.6.12-0.lvn.4
- Make xvid4 (XviD 1.0.x) the default xvid export module.
- Convert man pages to UTF-8.
* Sun Jul 18 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.6.12-0.lvn.3
- Build with theora by default, use "--without theora" to disable.
- BuildRequire libexif-devel to work around yet another missing dependency
in ImageMagick-devel.
- Replace hardcoded i686 BuildArch with i686+ ExclusiveArchs.
- Enable MMX and CMOV (also) when built on ia64 and x86_64.
- Enable SSE by default (only) on ia64 and x86_64; use "--with sse" to
enable it on other archs.
- Rebuild with libfame 0.9.1.
- First cut at building with pvm support (incomplete, disabled).
* Sat May 8 2004 Dams <anvil[AT]livna.org> - 0:0.6.12-0.lvn.2
- Added url in Source0
* Fri Jan 9 2004 Dams <anvil[AT]livna.org> 0:0.6.12-0.lvn.1
- Updated to 0.6.12
* Sun Nov 9 2003 Dams <anvil[AT]livna.org> 0:0.6.11-0.lvn.1
- Updated to 0.6.11
- exclude -> rm
* Mon Sep 29 2003 Dams <anvil[AT]livna.org> 0:0.6.10-0.fdr.2
- BuildArch i686
* Tue Sep 9 2003 Dams <anvil[AT]livna.org> 0:0.6.10-0.fdr.1
- Updated to 0.6.10
- Updated doc files
- Dropped Patch1 and Patch2 (applied upstream)
* Thu Aug 14 2003 Dams <anvil[AT]livna.org> 0:0.6.9-0.fdr.1
- Updated to 0.6.9
* Thu Jul 31 2003 Dams <anvil[AT]livna.org> 0:0.6.8-0.fdr.2
- Applied filter_resample-segfault-fix-0.6.8 patch from upstream
* Tue Jul 8 2003 Dams <anvil[AT]livna.org> 0:0.6.8-0.fdr.1
- Updated to 0.6.8
- Removed glib/gtk+ version in BuildReqs
* Mon Jun 2 2003 Warren Togami <warren(a)togami.com> 0:0.6.7-0.fdr.3
- Remove smp_flags due to build failure
* Sun Jun 1 2003 Dams <anvil[AT]livna.org> 0:0.6.7-0.fdr.2
- Enabled text filter
* Sun Jun 1 2003 Dams <anvil[AT]livna.org> 0:0.6.6-0.fdr.1
- Updated to 0.6.7
- Updated BuildRequires
* Sun Jun 1 2003 Dams <anvil[AT]livna.org> 0:0.6.6-0.fdr.3
- Removed URL in Source0
* Thu May 22 2003 Dams <anvil[AT]livna.org> 0:0.6.6-0.fdr.2
- Changed URL in Source0
* Thu May 22 2003 Dams <anvil[AT]livna.org> 0:0.6.6-0.fdr.1
- Updated to 0.6.6
- Updated doc entry
- Slightly modified ifarch condition for nasm
* Sat May 10 2003 Dams <anvil[AT]livna.org> 0:0.6.4-0.fdr.2
- Re-added ffmpeg-devel BuildRequires
- Added libquicktime-devel libpostproc-devel and nasm BuildRequires
* Sat May 10 2003 Dams <anvil[AT]livna.org> 0:0.6.4-0.fdr.1
- Updated to 0.6.4
- Added missing BuildRequires
- exclude some ".la" files
- buildroot -> RPM_BUILD_ROOT
* Wed Apr 23 2003 Dams <anvil[AT]livna.org>
- Initial build.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/transcode/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 22 Jul 2008 16:55:16 -0000 1.1
+++ .cvsignore 24 Jul 2008 12:45:33 -0000 1.2
@@ -0,0 +1 @@
+transcode-1.0.4.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/transcode/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 22 Jul 2008 16:55:16 -0000 1.1
+++ sources 24 Jul 2008 12:45:33 -0000 1.2
@@ -0,0 +1 @@
+6f05b9efb8d67540dd6dbb7b8db47504 transcode-1.0.4.tar.bz2
16 years, 4 months
- 1
- 0
rpms/libmad/devel libmad.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by David Juran
Author: juran
Update of /cvs/free/rpms/libmad/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv12892/devel
Modified Files:
.cvsignore sources
Added Files:
libmad.spec
Log Message:
Initial import
--- NEW FILE libmad.spec ---
Name: libmad
Version: 0.15.1b
Release: 7%{?dist}
Summary: MPEG audio decoder library
Group: System Environment/Libraries
License: GPLv2
URL: http://www.underbit.com/products/mad/
Source0: http://download.sourceforge.net/mad/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
%description
MAD is a high-quality MPEG audio decoder. It currently supports MPEG-1
and the MPEG-2 extension to Lower Sampling Frequencies, as well as the
so-called MPEG 2.5 format. All three audio layers (Layer I, Layer II,
and Layer III a.k.a. MP3) are fully implemented.
%package devel
Summary: MPEG audio decoder library development files
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: pkgconfig
%description devel
%{summary}.
%prep
%setup -q
sed -i -e /-fforce-mem/d configure* # -fforce-mem gone in gcc 4.2, noop earlier
touch -r aclocal.m4 configure.ac
# Create an additional pkgconfig file
%{__cat} << EOF > mad.pc
prefix=%{_prefix}
exec_prefix=%{_prefix}
libdir=%{_libdir}
includedir=%{_includedir}
Name: mad
Description: MPEG Audio Decoder
Requires:
Version: %{version}
Libs: -L%{_libdir} -lmad -lm
Cflags: -I%{_includedir}
EOF
%build
%configure \
%ifarch x86_64 ia64
--enable-fpm=64bit \
%endif
--disable-dependency-tracking \
--enable-accuracy \
--disable-debugging \
--disable-static
make %{?_smp_mflags} CPPFLAGS="$RPM_OPT_FLAGS"
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
%{__install} -D -p -m 0644 mad.pc %{buildroot}%{_libdir}/pkgconfig/mad.pc
%clean
rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%doc CHANGES COPYING COPYRIGHT CREDITS README TODO
%{_libdir}/libmad.so.*
%files devel
%defattr(-,root,root,-)
%{_libdir}/libmad.so
%{_libdir}/pkgconfig/mad.pc
%{_includedir}/mad.h
%changelog
* Thu Jul 24 2008 David Juran <david(a)juran.se> - 0.15.1b-7
- Bump release for RpmFusion
* Tue Feb 19 2008 David Juran <david(a)juran.se> - 0.15.1b-6
- use $RPM_OPT_FLAGS - Bz 1873
* Sun Sep 30 2007 David Juran <david(a)juran.se> - 0.15.1b-5
- Grab mad.pc from freshrpms.
- merge configure-optioins with freshrpms
- Adjusted Licence tag (GPLv2)
- Drop static archive
* Fri Oct 06 2006 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 0.15.1b-4
- rebuilt for unwind info generation, broken in gcc-4.1.1-21
* Tue Sep 19 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.15.1b-3
- Use 64bit fixed point math on x86_64.
- Filter deprecated gcc flags, build with dependency tracking disabled.
- Move "b" to version field.
* Mon Mar 13 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> 0.15.1-2.b
- Drop Epoch in devel dep, too
* Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- switch to new release field
- drop Epoch
* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- add dist
* Wed Feb 18 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.15.1-0.lvn.1.b
- Update to 0.15.1b.
* Sun Sep 28 2003 Dams <anvil[AT]livna.org> 0:0.15.0-0.fdr.1.b.0.94
- Remove comment after scriptlets
* Mon Jun 30 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.15.0-0.fdr.1.b
- Update to 0.15.0b.
- Split separate from the old mad package to follow upstream.
- -devel requires pkgconfig.
* Thu Apr 24 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.14.2-0.fdr.3.b
- Fix missing "main" package dependencies in *-devel.
- Include patch from Debian, possibly fixes #187 comment 7, and adds
pkgconfig files for libraries.
* Sun Apr 20 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.14.2-0.fdr.2.b
- Split into mad, libmad, -devel, libid3tag and -devel packages (#187).
- Provide mp3-cmdline virtual package and alternative.
- Build shared library.
* Fri Apr 4 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.14.2-0.fdr.1.b
- Update to current Fedora guidelines.
- Exclude %%{_libdir}/*.la.
* Thu Feb 20 2003 Ville Skyttä <ville.skytta at iki.fi> - 0.14.2b-1.fedora.1
- First Fedora release, based on Matthias Saou's work.
* Fri Sep 27 2002 Matthias Saou <matthias.saou(a)est.une.marmotte.net>
- Rebuild for Red Hat Linux 8.0 (missing because of license issues).
- Spec file cleanup.
* Tue Mar 12 2002 Bill Nottingham <notting(a)redhat.com> 0.14.2b-3
- ship libid3tag too
* Thu Feb 21 2002 Bill Nottingham <notting(a)redhat.com>
- rebuild
* Mon Jan 28 2002 Bill Nottingham <notting(a)redhat.com>
- split libmad off into a separate package
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/libmad/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 2 Nov 2007 18:36:12 -0000 1.1
+++ .cvsignore 24 Jul 2008 12:30:10 -0000 1.2
@@ -0,0 +1 @@
+libmad-0.15.1b.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/libmad/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 2 Nov 2007 18:36:12 -0000 1.1
+++ sources 24 Jul 2008 12:30:10 -0000 1.2
@@ -0,0 +1 @@
+1be543bc30c56fb6bea1d7bf6a64e66c libmad-0.15.1b.tar.gz
16 years, 4 months
- 1
- 0
rpms/libmad/F-9 libmad.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by David Juran
Author: juran
Update of /cvs/free/rpms/libmad/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv12710/F-9
Modified Files:
.cvsignore sources
Added Files:
libmad.spec
Log Message:
Initial import
--- NEW FILE libmad.spec ---
Name: libmad
Version: 0.15.1b
Release: 7%{?dist}
Summary: MPEG audio decoder library
Group: System Environment/Libraries
License: GPLv2
URL: http://www.underbit.com/products/mad/
Source0: http://download.sourceforge.net/mad/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
%description
MAD is a high-quality MPEG audio decoder. It currently supports MPEG-1
and the MPEG-2 extension to Lower Sampling Frequencies, as well as the
so-called MPEG 2.5 format. All three audio layers (Layer I, Layer II,
and Layer III a.k.a. MP3) are fully implemented.
%package devel
Summary: MPEG audio decoder library development files
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: pkgconfig
%description devel
%{summary}.
%prep
%setup -q
sed -i -e /-fforce-mem/d configure* # -fforce-mem gone in gcc 4.2, noop earlier
touch -r aclocal.m4 configure.ac
# Create an additional pkgconfig file
%{__cat} << EOF > mad.pc
prefix=%{_prefix}
exec_prefix=%{_prefix}
libdir=%{_libdir}
includedir=%{_includedir}
Name: mad
Description: MPEG Audio Decoder
Requires:
Version: %{version}
Libs: -L%{_libdir} -lmad -lm
Cflags: -I%{_includedir}
EOF
%build
%configure \
%ifarch x86_64 ia64
--enable-fpm=64bit \
%endif
--disable-dependency-tracking \
--enable-accuracy \
--disable-debugging \
--disable-static
make %{?_smp_mflags} CPPFLAGS="$RPM_OPT_FLAGS"
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
%{__install} -D -p -m 0644 mad.pc %{buildroot}%{_libdir}/pkgconfig/mad.pc
%clean
rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%doc CHANGES COPYING COPYRIGHT CREDITS README TODO
%{_libdir}/libmad.so.*
%files devel
%defattr(-,root,root,-)
%{_libdir}/libmad.so
%{_libdir}/pkgconfig/mad.pc
%{_includedir}/mad.h
%changelog
* Thu Jul 24 2008 David Juran <david(a)juran.se> - 0.15.1b-7
- Bump release for RpmFusion
* Tue Feb 19 2008 David Juran <david(a)juran.se> - 0.15.1b-6
- use $RPM_OPT_FLAGS - Bz 1873
* Sun Sep 30 2007 David Juran <david(a)juran.se> - 0.15.1b-5
- Grab mad.pc from freshrpms.
- merge configure-optioins with freshrpms
- Adjusted Licence tag (GPLv2)
- Drop static archive
* Fri Oct 06 2006 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 0.15.1b-4
- rebuilt for unwind info generation, broken in gcc-4.1.1-21
* Tue Sep 19 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.15.1b-3
- Use 64bit fixed point math on x86_64.
- Filter deprecated gcc flags, build with dependency tracking disabled.
- Move "b" to version field.
* Mon Mar 13 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> 0.15.1-2.b
- Drop Epoch in devel dep, too
* Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- switch to new release field
- drop Epoch
* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- add dist
* Wed Feb 18 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.15.1-0.lvn.1.b
- Update to 0.15.1b.
* Sun Sep 28 2003 Dams <anvil[AT]livna.org> 0:0.15.0-0.fdr.1.b.0.94
- Remove comment after scriptlets
* Mon Jun 30 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.15.0-0.fdr.1.b
- Update to 0.15.0b.
- Split separate from the old mad package to follow upstream.
- -devel requires pkgconfig.
* Thu Apr 24 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.14.2-0.fdr.3.b
- Fix missing "main" package dependencies in *-devel.
- Include patch from Debian, possibly fixes #187 comment 7, and adds
pkgconfig files for libraries.
* Sun Apr 20 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.14.2-0.fdr.2.b
- Split into mad, libmad, -devel, libid3tag and -devel packages (#187).
- Provide mp3-cmdline virtual package and alternative.
- Build shared library.
* Fri Apr 4 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.14.2-0.fdr.1.b
- Update to current Fedora guidelines.
- Exclude %%{_libdir}/*.la.
* Thu Feb 20 2003 Ville Skyttä <ville.skytta at iki.fi> - 0.14.2b-1.fedora.1
- First Fedora release, based on Matthias Saou's work.
* Fri Sep 27 2002 Matthias Saou <matthias.saou(a)est.une.marmotte.net>
- Rebuild for Red Hat Linux 8.0 (missing because of license issues).
- Spec file cleanup.
* Tue Mar 12 2002 Bill Nottingham <notting(a)redhat.com> 0.14.2b-3
- ship libid3tag too
* Thu Feb 21 2002 Bill Nottingham <notting(a)redhat.com>
- rebuild
* Mon Jan 28 2002 Bill Nottingham <notting(a)redhat.com>
- split libmad off into a separate package
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/libmad/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 2 Nov 2007 18:36:12 -0000 1.1
+++ .cvsignore 24 Jul 2008 12:29:32 -0000 1.2
@@ -0,0 +1 @@
+libmad-0.15.1b.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/libmad/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 2 Nov 2007 18:36:12 -0000 1.1
+++ sources 24 Jul 2008 12:29:32 -0000 1.2
@@ -0,0 +1 @@
+1be543bc30c56fb6bea1d7bf6a64e66c libmad-0.15.1b.tar.gz
16 years, 4 months
- 1
- 0
rpms/libmad/F-8 libmad.spec,1.1,1.2
by David Juran
Author: juran
Update of /cvs/free/rpms/libmad/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv12413
Modified Files:
libmad.spec
Log Message:
Bump released for RpmFusion
Index: libmad.spec
===================================================================
RCS file: /cvs/free/rpms/libmad/F-8/libmad.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libmad.spec 24 Jul 2008 12:23:59 -0000 1.1
+++ libmad.spec 24 Jul 2008 12:27:58 -0000 1.2
@@ -1,6 +1,6 @@
Name: libmad
Version: 0.15.1b
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: MPEG audio decoder library
Group: System Environment/Libraries
@@ -90,6 +90,9 @@
%changelog
+* Thu Jul 24 2008 David Juran <david(a)juran.se> - 0.15.1b-7
+- Bump release for RpmFusion
+
* Tue Feb 19 2008 David Juran <david(a)juran.se> - 0.15.1b-6
- use $RPM_OPT_FLAGS - Bz 1873
16 years, 4 months
- 1
- 0
rpms/libmad/F-8 libmad.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by David Juran
Author: juran
Update of /cvs/free/rpms/libmad/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv12022/F-8
Modified Files:
.cvsignore sources
Added Files:
libmad.spec
Log Message:
Initial import
--- NEW FILE libmad.spec ---
Name: libmad
Version: 0.15.1b
Release: 6%{?dist}
Summary: MPEG audio decoder library
Group: System Environment/Libraries
License: GPLv2
URL: http://www.underbit.com/products/mad/
Source0: http://download.sourceforge.net/mad/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
%description
MAD is a high-quality MPEG audio decoder. It currently supports MPEG-1
and the MPEG-2 extension to Lower Sampling Frequencies, as well as the
so-called MPEG 2.5 format. All three audio layers (Layer I, Layer II,
and Layer III a.k.a. MP3) are fully implemented.
%package devel
Summary: MPEG audio decoder library development files
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: pkgconfig
%description devel
%{summary}.
%prep
%setup -q
sed -i -e /-fforce-mem/d configure* # -fforce-mem gone in gcc 4.2, noop earlier
touch -r aclocal.m4 configure.ac
# Create an additional pkgconfig file
%{__cat} << EOF > mad.pc
prefix=%{_prefix}
exec_prefix=%{_prefix}
libdir=%{_libdir}
includedir=%{_includedir}
Name: mad
Description: MPEG Audio Decoder
Requires:
Version: %{version}
Libs: -L%{_libdir} -lmad -lm
Cflags: -I%{_includedir}
EOF
%build
%configure \
%ifarch x86_64 ia64
--enable-fpm=64bit \
%endif
--disable-dependency-tracking \
--enable-accuracy \
--disable-debugging \
--disable-static
make %{?_smp_mflags} CPPFLAGS="$RPM_OPT_FLAGS"
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
%{__install} -D -p -m 0644 mad.pc %{buildroot}%{_libdir}/pkgconfig/mad.pc
%clean
rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%doc CHANGES COPYING COPYRIGHT CREDITS README TODO
%{_libdir}/libmad.so.*
%files devel
%defattr(-,root,root,-)
%{_libdir}/libmad.so
%{_libdir}/pkgconfig/mad.pc
%{_includedir}/mad.h
%changelog
* Tue Feb 19 2008 David Juran <david(a)juran.se> - 0.15.1b-6
- use $RPM_OPT_FLAGS - Bz 1873
* Sun Sep 30 2007 David Juran <david(a)juran.se> - 0.15.1b-5
- Grab mad.pc from freshrpms.
- merge configure-optioins with freshrpms
- Adjusted Licence tag (GPLv2)
- Drop static archive
* Fri Oct 06 2006 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 0.15.1b-4
- rebuilt for unwind info generation, broken in gcc-4.1.1-21
* Tue Sep 19 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.15.1b-3
- Use 64bit fixed point math on x86_64.
- Filter deprecated gcc flags, build with dependency tracking disabled.
- Move "b" to version field.
* Mon Mar 13 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> 0.15.1-2.b
- Drop Epoch in devel dep, too
* Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- switch to new release field
- drop Epoch
* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- add dist
* Wed Feb 18 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.15.1-0.lvn.1.b
- Update to 0.15.1b.
* Sun Sep 28 2003 Dams <anvil[AT]livna.org> 0:0.15.0-0.fdr.1.b.0.94
- Remove comment after scriptlets
* Mon Jun 30 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.15.0-0.fdr.1.b
- Update to 0.15.0b.
- Split separate from the old mad package to follow upstream.
- -devel requires pkgconfig.
* Thu Apr 24 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.14.2-0.fdr.3.b
- Fix missing "main" package dependencies in *-devel.
- Include patch from Debian, possibly fixes #187 comment 7, and adds
pkgconfig files for libraries.
* Sun Apr 20 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.14.2-0.fdr.2.b
- Split into mad, libmad, -devel, libid3tag and -devel packages (#187).
- Provide mp3-cmdline virtual package and alternative.
- Build shared library.
* Fri Apr 4 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.14.2-0.fdr.1.b
- Update to current Fedora guidelines.
- Exclude %%{_libdir}/*.la.
* Thu Feb 20 2003 Ville Skyttä <ville.skytta at iki.fi> - 0.14.2b-1.fedora.1
- First Fedora release, based on Matthias Saou's work.
* Fri Sep 27 2002 Matthias Saou <matthias.saou(a)est.une.marmotte.net>
- Rebuild for Red Hat Linux 8.0 (missing because of license issues).
- Spec file cleanup.
* Tue Mar 12 2002 Bill Nottingham <notting(a)redhat.com> 0.14.2b-3
- ship libid3tag too
* Thu Feb 21 2002 Bill Nottingham <notting(a)redhat.com>
- rebuild
* Mon Jan 28 2002 Bill Nottingham <notting(a)redhat.com>
- split libmad off into a separate package
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/libmad/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 2 Nov 2007 18:36:12 -0000 1.1
+++ .cvsignore 24 Jul 2008 12:23:59 -0000 1.2
@@ -0,0 +1 @@
+libmad-0.15.1b.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/libmad/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 2 Nov 2007 18:36:12 -0000 1.1
+++ sources 24 Jul 2008 12:23:59 -0000 1.2
@@ -0,0 +1 @@
+1be543bc30c56fb6bea1d7bf6a64e66c libmad-0.15.1b.tar.gz
16 years, 4 months
- 1
- 0
rpms/a52dec/devel a52dec-0.7.4-rpath64.patch, NONE, 1.1 a52dec-configure-optflags.patch, NONE, 1.1 a52dec.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by David Juran
Author: juran
Update of /cvs/free/rpms/a52dec/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9941/devel
Modified Files:
.cvsignore sources
Added Files:
a52dec-0.7.4-rpath64.patch a52dec-configure-optflags.patch
a52dec.spec
Log Message:
Initial import
a52dec-0.7.4-rpath64.patch:
--- NEW FILE a52dec-0.7.4-rpath64.patch ---
--- a52dec-0.7.4/configure~ 2002-07-28 06:50:42.000000000 +0300
+++ a52dec-0.7.4/configure 2006-02-16 23:03:07.000000000 +0200
@@ -5839,7 +5839,7 @@
shlibpath_overrides_runpath=unknown
version_type=none
dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
+sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
case $host_os in
--- a52dec-0.7.4/aclocal.m4~ 2002-07-28 06:50:38.000000000 +0300
+++ a52dec-0.7.4/aclocal.m4 2006-02-16 23:02:38.000000000 +0200
@@ -2141,7 +2141,7 @@
shlibpath_overrides_runpath=unknown
version_type=none
dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
+sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
case $host_os in
a52dec-configure-optflags.patch:
--- NEW FILE a52dec-configure-optflags.patch ---
--- configure~ 2002-07-28 06:50:42.000000000 +0300
+++ configure 2003-04-13 17:20:53.000000000 +0300
@@ -2857,13 +2857,13 @@
case "$host" in
i?86-* | k?-*)
- case "$host" in
- i386-*) OPT_CFLAGS="$CFLAGS -mcpu=i386";;
- i486-*) OPT_CFLAGS="$CFLAGS -mcpu=i486";;
- i586-*) OPT_CFLAGS="$CFLAGS -mcpu=pentium";;
- i686-*) OPT_CFLAGS="$CFLAGS -mcpu=pentiumpro";;
- k6-*) OPT_CFLAGS="$CFLAGS -mcpu=k6";;
- esac
+# case "$host" in
+# i386-*) OPT_CFLAGS="$CFLAGS -mcpu=i386";;
+# i486-*) OPT_CFLAGS="$CFLAGS -mcpu=i486";;
+# i586-*) OPT_CFLAGS="$CFLAGS -mcpu=pentium";;
+# i686-*) OPT_CFLAGS="$CFLAGS -mcpu=pentiumpro";;
+# k6-*) OPT_CFLAGS="$CFLAGS -mcpu=k6";;
+# esac
echo "$as_me:$LINENO: checking if $CC supports $OPT_CFLAGS flags" >&5
echo $ECHO_N "checking if $CC supports $OPT_CFLAGS flags... $ECHO_C" >&6
SAVE_CFLAGS="$CFLAGS"
--- NEW FILE a52dec.spec ---
Summary: A free ATSC A/52 stream decoder
Name: a52dec
Version: 0.7.4
Release: 12%{?dist}
License: GPLv2
Group: System Environment/Libraries
URL: http://liba52.sourceforge.net/
Source0: http://liba52.sourceforge.net/files/%{name}-%{version}.tar.gz
Patch0: a52dec-configure-optflags.patch
Patch1: a52dec-0.7.4-rpath64.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
BuildRequires: %{__perl}
%package devel
Summary: Development files needed for a52dec
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: djbfft-devel
#---------------------------------------------------------------------
%description
liba52 is a free library for decoding ATSC A/52 streams. The A/52
standard is used in a variety of applications, including digital
television and DVD. It is also known as AC-3. The package also
includes a52dec, a small test program for liba52.
%description devel
liba52 is a free library for decoding ATSC A/52 streams. The A/52
standard is used in a variety of applications, including digital
television and DVD. It is also known as AC-3.
This package contains development files for a52dec.
#---------------------------------------------------------------------
%prep
%setup -q
%patch0
%patch1 -p1
%{__perl} -pi -e 's/-prefer-non-pic\b/-prefer-pic/' \
configure liba52/configure.incl
#---------------------------------------------------------------------
%build
%configure --enable-shared --disable-static
make %{?_smp_mflags}
#---------------------------------------------------------------------
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=%{buildroot}
#---------------------------------------------------------------------
%clean
rm -rf $RPM_BUILD_ROOT
#---------------------------------------------------------------------
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%exclude %{_libdir}/liba52.la
%doc AUTHORS COPYING ChangeLog HISTORY NEWS TODO
%{_libdir}/liba52.so.*
%{_bindir}/a52dec
%{_bindir}/extract_a52
%{_mandir}/man1/a52dec.1*
%{_mandir}/man1/extract_a52.1*
%files devel
%defattr(-,root,root,-)
%doc doc/liba52.txt
%{_includedir}/a52dec
%{_libdir}/liba52.so
#---------------------------------------------------------------------
%changelog
* Thu Jul 24 2008 David Juran <david(a)juran.se> - 0.7.4-12
- Bump Release for RpmFusion
* Mon Oct 1 2007 David Juran <david(a)juran.se> - 0.7.4-11
- Fix Licence tag to be GPLv2
- Drop %makeinstall macro
- Drop static archive
- Drop djbfft
* Fri Oct 06 2006 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 0.7.4-10
- rebuilt for unwind info generation, broken in gcc-4.1.1-21
* Mon Mar 13 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0.7.4-9
- Drop epoch in devel dep, too
* Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- switch to new release field
- drop epoch
* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- add dist
* Thu Feb 16 2006 Ville Skyttä <ville.skytta at iki.fi> - 0:0.7.4-0.lvn.8
- Avoid standard rpaths on lib64 archs.
* Tue Jul 27 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.7.4-0.lvn.7
- Prefer PIC.
- (Build)Require djbfft-devel.
- Include more docs.
* Sun Sep 28 2003 Dams <anvil[AT]livna.org> 0:0.7.4-0.fdr.6
- Removed comment after scriptlets
- buildroot -> RPM_BUILD_ROOT
* Mon Apr 14 2003 Dams <anvil[AT]livna.org> 0:0.7.4-0.fdr.5
- devel package require djbfft (not djbfft-devel)
* Sun Apr 13 2003 Dams <anvil[AT]livna.org> 0:0.7.4-0.fdr.4
- Enabled support for djbfft
* Sun Apr 13 2003 Dams <anvil[AT]livna.org> 0:0.7.4-0.fdr.3
- Added post and postun scriplet
- moved man pages from devel to main package
* Sun Apr 13 2003 Dams <anvil[AT]livna.org> 0:0.7.4-0.fdr.2
- make configure honor optflags
- devel package
- shared library added
* Thu Apr 10 2003 Dams <anvil[AT]livna.org>
- Initial build.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/a52dec/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 20 Jul 2008 10:30:49 -0000 1.1
+++ .cvsignore 24 Jul 2008 11:48:34 -0000 1.2
@@ -0,0 +1 @@
+a52dec-0.7.4.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/a52dec/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 20 Jul 2008 10:30:49 -0000 1.1
+++ sources 24 Jul 2008 11:48:34 -0000 1.2
@@ -0,0 +1 @@
+caa9f5bc44232dc8aeea773fea56be80 a52dec-0.7.4.tar.gz
16 years, 4 months
- 1
- 0
rpms/a52dec/F-9 a52dec-0.7.4-rpath64.patch, NONE, 1.1 a52dec-configure-optflags.patch, NONE, 1.1 a52dec.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by David Juran
Author: juran
Update of /cvs/free/rpms/a52dec/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9412/F-9
Modified Files:
.cvsignore sources
Added Files:
a52dec-0.7.4-rpath64.patch a52dec-configure-optflags.patch
a52dec.spec
Log Message:
Initial import
a52dec-0.7.4-rpath64.patch:
--- NEW FILE a52dec-0.7.4-rpath64.patch ---
--- a52dec-0.7.4/configure~ 2002-07-28 06:50:42.000000000 +0300
+++ a52dec-0.7.4/configure 2006-02-16 23:03:07.000000000 +0200
@@ -5839,7 +5839,7 @@
shlibpath_overrides_runpath=unknown
version_type=none
dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
+sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
case $host_os in
--- a52dec-0.7.4/aclocal.m4~ 2002-07-28 06:50:38.000000000 +0300
+++ a52dec-0.7.4/aclocal.m4 2006-02-16 23:02:38.000000000 +0200
@@ -2141,7 +2141,7 @@
shlibpath_overrides_runpath=unknown
version_type=none
dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
+sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
case $host_os in
a52dec-configure-optflags.patch:
--- NEW FILE a52dec-configure-optflags.patch ---
--- configure~ 2002-07-28 06:50:42.000000000 +0300
+++ configure 2003-04-13 17:20:53.000000000 +0300
@@ -2857,13 +2857,13 @@
case "$host" in
i?86-* | k?-*)
- case "$host" in
- i386-*) OPT_CFLAGS="$CFLAGS -mcpu=i386";;
- i486-*) OPT_CFLAGS="$CFLAGS -mcpu=i486";;
- i586-*) OPT_CFLAGS="$CFLAGS -mcpu=pentium";;
- i686-*) OPT_CFLAGS="$CFLAGS -mcpu=pentiumpro";;
- k6-*) OPT_CFLAGS="$CFLAGS -mcpu=k6";;
- esac
+# case "$host" in
+# i386-*) OPT_CFLAGS="$CFLAGS -mcpu=i386";;
+# i486-*) OPT_CFLAGS="$CFLAGS -mcpu=i486";;
+# i586-*) OPT_CFLAGS="$CFLAGS -mcpu=pentium";;
+# i686-*) OPT_CFLAGS="$CFLAGS -mcpu=pentiumpro";;
+# k6-*) OPT_CFLAGS="$CFLAGS -mcpu=k6";;
+# esac
echo "$as_me:$LINENO: checking if $CC supports $OPT_CFLAGS flags" >&5
echo $ECHO_N "checking if $CC supports $OPT_CFLAGS flags... $ECHO_C" >&6
SAVE_CFLAGS="$CFLAGS"
--- NEW FILE a52dec.spec ---
Summary: A free ATSC A/52 stream decoder
Name: a52dec
Version: 0.7.4
Release: 12%{?dist}
License: GPLv2
Group: System Environment/Libraries
URL: http://liba52.sourceforge.net/
Source0: http://liba52.sourceforge.net/files/%{name}-%{version}.tar.gz
Patch0: a52dec-configure-optflags.patch
Patch1: a52dec-0.7.4-rpath64.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
BuildRequires: %{__perl}
%package devel
Summary: Development files needed for a52dec
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: djbfft-devel
#---------------------------------------------------------------------
%description
liba52 is a free library for decoding ATSC A/52 streams. The A/52
standard is used in a variety of applications, including digital
television and DVD. It is also known as AC-3. The package also
includes a52dec, a small test program for liba52.
%description devel
liba52 is a free library for decoding ATSC A/52 streams. The A/52
standard is used in a variety of applications, including digital
television and DVD. It is also known as AC-3.
This package contains development files for a52dec.
#---------------------------------------------------------------------
%prep
%setup -q
%patch0
%patch1 -p1
%{__perl} -pi -e 's/-prefer-non-pic\b/-prefer-pic/' \
configure liba52/configure.incl
#---------------------------------------------------------------------
%build
%configure --enable-shared --disable-static
make %{?_smp_mflags}
#---------------------------------------------------------------------
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=%{buildroot}
#---------------------------------------------------------------------
%clean
rm -rf $RPM_BUILD_ROOT
#---------------------------------------------------------------------
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%exclude %{_libdir}/liba52.la
%doc AUTHORS COPYING ChangeLog HISTORY NEWS TODO
%{_libdir}/liba52.so.*
%{_bindir}/a52dec
%{_bindir}/extract_a52
%{_mandir}/man1/a52dec.1*
%{_mandir}/man1/extract_a52.1*
%files devel
%defattr(-,root,root,-)
%doc doc/liba52.txt
%{_includedir}/a52dec
%{_libdir}/liba52.so
#---------------------------------------------------------------------
%changelog
* Thu Jul 24 2008 David Juran <david(a)juran.se> - 0.7.4-12
- Bump Release for RpmFusion
* Mon Oct 1 2007 David Juran <david(a)juran.se> - 0.7.4-11
- Fix Licence tag to be GPLv2
- Drop %makeinstall macro
- Drop static archive
- Drop djbfft
* Fri Oct 06 2006 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 0.7.4-10
- rebuilt for unwind info generation, broken in gcc-4.1.1-21
* Mon Mar 13 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0.7.4-9
- Drop epoch in devel dep, too
* Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- switch to new release field
- drop epoch
* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- add dist
* Thu Feb 16 2006 Ville Skyttä <ville.skytta at iki.fi> - 0:0.7.4-0.lvn.8
- Avoid standard rpaths on lib64 archs.
* Tue Jul 27 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.7.4-0.lvn.7
- Prefer PIC.
- (Build)Require djbfft-devel.
- Include more docs.
* Sun Sep 28 2003 Dams <anvil[AT]livna.org> 0:0.7.4-0.fdr.6
- Removed comment after scriptlets
- buildroot -> RPM_BUILD_ROOT
* Mon Apr 14 2003 Dams <anvil[AT]livna.org> 0:0.7.4-0.fdr.5
- devel package require djbfft (not djbfft-devel)
* Sun Apr 13 2003 Dams <anvil[AT]livna.org> 0:0.7.4-0.fdr.4
- Enabled support for djbfft
* Sun Apr 13 2003 Dams <anvil[AT]livna.org> 0:0.7.4-0.fdr.3
- Added post and postun scriplet
- moved man pages from devel to main package
* Sun Apr 13 2003 Dams <anvil[AT]livna.org> 0:0.7.4-0.fdr.2
- make configure honor optflags
- devel package
- shared library added
* Thu Apr 10 2003 Dams <anvil[AT]livna.org>
- Initial build.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/a52dec/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 20 Jul 2008 10:30:49 -0000 1.1
+++ .cvsignore 24 Jul 2008 11:47:45 -0000 1.2
@@ -0,0 +1 @@
+a52dec-0.7.4.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/a52dec/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 20 Jul 2008 10:30:49 -0000 1.1
+++ sources 24 Jul 2008 11:47:45 -0000 1.2
@@ -0,0 +1 @@
+caa9f5bc44232dc8aeea773fea56be80 a52dec-0.7.4.tar.gz
16 years, 4 months
- 1
- 0
rpms/megamario/devel megamario.desktop, NONE, 1.1 megamario.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/megamario/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9164/devel
Modified Files:
.cvsignore sources
Added Files:
megamario.desktop megamario.spec
Log Message:
initial megamario import
--- NEW FILE megamario.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Mega Mario
Comment=Well known platform game clone
Exec=megamario
Icon=megamario.png
Terminal=false
StartupNotify=false
Type=Application
Categories=Game;ActionGame;
--- NEW FILE megamario.spec ---
Name: megamario
Version: 1.5
Release: 1%{?dist}
Summary: Well known platform game clone
Group: Amusements/Games
License: LGPL
URL: http://mmario.sourceforge.net/
Source0: http://downloads.sourceforge.net/mmario/MegaMario_v1.5_w32_linux.zip
Source1: %{name}.desktop
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL_mixer-devel SDL_image-devel SDL_ttf-devel
BuildRequires: ImageMagick desktop-file-utils
Requires: hicolor-icon-theme
%description
MegaMario is a clone of a well know platform game, featuring 25 new levels. In
the game you play Mario and your task is to free his brother Luigi, who was
captured by the evil Bowser.
%prep
%setup -q -c
sed -i 's/\r//' *.txt
%build
make %{?_smp_mflags} PREFIX=%{_prefix} \
CFLAGS="$RPM_OPT_FLAGS -fsigned-char"
convert -transparent '#FF00FF' data/gfx/characters/small/player1r.PNG \
%{name}.png
%install
rm -rf $RPM_BUILD_ROOT
make install PREFIX=$RPM_BUILD_ROOT%{_prefix}
# cruft removal
rm $RPM_BUILD_ROOT%{_datadir}/megamario/levels/1/1
rm $RPM_BUILD_ROOT%{_datadir}/megamario/levels/11/maiin
rm $RPM_BUILD_ROOT%{_datadir}/megamario/save.sav
rm $RPM_BUILD_ROOT%{_datadir}/megamario/sfx/jump.gpk
rm $RPM_BUILD_ROOT%{_datadir}/megamario/gfx/tiles/pipes/left/Desktop.ini
# below is the desktop file and icon stuff.
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor dribble \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
%{SOURCE1}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
install -p -m 644 %{name}.png \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
%clean
rm -rf $RPM_BUILD_ROOT
%post
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%postun
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%files
%defattr(-,root,root,-)
%doc CONTROLS.txt licence.txt readme.txt fixes_v1.5.txt
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/applications/dribble-%{name}.desktop
%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
%changelog
* Tue Jun 5 2007 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.5-1%{?dist}
- New upstream release 1.5
* Sat Mar 10 2007 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.3-3%{?dist}
- Fixup .desktop file categories for games-menus usage
- No longer use preconverted .png as RH bug 196010 is fixed
* Sun Jul 9 2006 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.3-2%{?dist}
- Use a preconverted .png as icon to work around RH bug 196010
* Thu Jun 15 2006 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.3-1%{?dist}
- Initial Fedora Extras package
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/megamario/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 1 Jun 2008 12:06:28 -0000 1.1
+++ .cvsignore 24 Jul 2008 11:47:01 -0000 1.2
@@ -0,0 +1 @@
+MegaMario_v1.5_w32_linux.zip
Index: sources
===================================================================
RCS file: /cvs/free/rpms/megamario/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 1 Jun 2008 12:06:28 -0000 1.1
+++ sources 24 Jul 2008 11:47:01 -0000 1.2
@@ -0,0 +1 @@
+45853daeba399fe67bcb289d3543641d MegaMario_v1.5_w32_linux.zip
16 years, 4 months
- 1
- 0
rpms/fakenes/F-8 fakenes-0.5.8-alutinit.patch, NONE, 1.1 fakenes-0.5.8-driver-switch.patch, NONE, 1.1 fakenes-0.5.8-menu-exit.patch, NONE, 1.1 fakenes.desktop, NONE, 1.1 fakenes.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/fakenes/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8904
Modified Files:
.cvsignore sources
Added Files:
fakenes-0.5.8-alutinit.patch fakenes-0.5.8-driver-switch.patch
fakenes-0.5.8-menu-exit.patch fakenes.desktop fakenes.spec
Log Message:
* Thu Jul 24 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.5.8-5
- Release bump for rpmfusion
fakenes-0.5.8-alutinit.patch:
--- NEW FILE fakenes-0.5.8-alutinit.patch ---
--- fakenes-0.5.8/src/audiolib.c.alutinit 2006-04-24 23:21:22.000000000 +0200
+++ fakenes-0.5.8/src/audiolib.c 2006-08-13 00:41:18.000000000 +0200
@@ -415,8 +415,13 @@
/* Interpolation is not supported. */
audio_interpolation = FALSE;
- alutInit (&saved_argc, saved_argv);
- AL_CHECK();
+ if(!alutInit (&saved_argc, saved_argv))
+ {
+ /* make sure other openal functions don't get called as that causes
+ crashes */
+ audiolib_driver = NULL;
+ return (1);
+ }
/* Autodetect settings. */
fakenes-0.5.8-driver-switch.patch:
--- NEW FILE fakenes-0.5.8-driver-switch.patch ---
--- fakenes-0.5.8/src/gui.c.driver 2006-04-26 15:20:24.000000000 +0200
+++ fakenes-0.5.8/src/gui.c 2006-08-11 22:30:57.000000000 +0200
@@ -237,55 +237,58 @@
TOGGLE_MENU_ITEM(audio_channels_menu_extended_2, dsp_get_channel_enabled (APU_CHANNEL_EXTRA_2));
TOGGLE_MENU_ITEM(audio_channels_menu_extended_3, dsp_get_channel_enabled (APU_CHANNEL_EXTRA_3));
+ TOGGLE_MENU_ITEM(video_driver_menu_automatic, (menu_video_driver == GFX_AUTODETECT));
+
#ifdef ALLEGRO_DOS
- TOGGLE_MENU_ITEM(video_driver_dos_menu_vga, (gfx_driver->id == GFX_VGA));
- TOGGLE_MENU_ITEM(video_driver_dos_menu_vga_mode_x, (gfx_driver->id == GFX_MODEX));
- TOGGLE_MENU_ITEM(video_driver_dos_menu_vesa, (gfx_driver->id == GFX_VESA1));
- TOGGLE_MENU_ITEM(video_driver_dos_menu_vesa_2_banked, (gfx_driver->id == GFX_VESA2B));
- TOGGLE_MENU_ITEM(video_driver_dos_menu_vesa_2_linear, (gfx_driver->id == GFX_VESA2L));
- TOGGLE_MENU_ITEM(video_driver_dos_menu_vesa_3, (gfx_driver->id == GFX_VESA3));
- TOGGLE_MENU_ITEM(video_driver_dos_menu_vesa_vbe_af, (gfx_driver->id == GFX_VBEAF));
+ TOGGLE_MENU_ITEM(video_driver_dos_menu_vga, (menu_video_driver == GFX_VGA));
+ TOGGLE_MENU_ITEM(video_driver_dos_menu_vga_mode_x, (menu_video_driver == GFX_MODEX));
+ TOGGLE_MENU_ITEM(video_driver_dos_menu_vesa, (menu_video_driver == GFX_VESA1));
+ TOGGLE_MENU_ITEM(video_driver_dos_menu_vesa_2_banked, (menu_video_driver == GFX_VESA2B));
+ TOGGLE_MENU_ITEM(video_driver_dos_menu_vesa_2_linear, (menu_video_driver == GFX_VESA2L));
+ TOGGLE_MENU_ITEM(video_driver_dos_menu_vesa_3, (menu_video_driver == GFX_VESA3));
+ TOGGLE_MENU_ITEM(video_driver_dos_menu_vesa_vbe_af, (menu_video_driver == GFX_VBEAF));
#endif /* ALLEGRO_DOS */
#ifdef ALLEGRO_WINDOWS
- TOGGLE_MENU_ITEM(video_driver_windows_menu_directx, (gfx_driver->id == GFX_DIRECTX));
- TOGGLE_MENU_ITEM(video_driver_windows_menu_directx_window, (gfx_driver->id == GFX_DIRECTX_WIN));
- TOGGLE_MENU_ITEM(video_driver_windows_menu_directx_overlay, (gfx_driver->id == GFX_DIRECTX_OVL));
- TOGGLE_MENU_ITEM(video_driver_windows_menu_gdi, (gfx_driver->id == GFX_GDI));
+ TOGGLE_MENU_ITEM(video_driver_windows_menu_directx, (menu_video_driver == GFX_DIRECTX));
+ TOGGLE_MENU_ITEM(video_driver_windows_menu_directx_window, (menu_video_driver == GFX_DIRECTX_WIN));
+ TOGGLE_MENU_ITEM(video_driver_windows_menu_directx_overlay, (menu_video_driver == GFX_DIRECTX_OVL));
+ TOGGLE_MENU_ITEM(video_driver_windows_menu_gdi, (menu_video_driver == GFX_GDI));
#endif /* ALLEGRO_WINDOWS */
#ifdef ALLEGRO_LINUX
- TOGGLE_MENU_ITEM(video_driver_linux_menu_vga, (gfx_driver->id == GFX_VGA));
- TOGGLE_MENU_ITEM(video_driver_linux_menu_vga_mode_x, (gfx_driver->id == GFX_MODEX));
- TOGGLE_MENU_ITEM(video_driver_linux_menu_vesa_vbe_af, (gfx_driver->id == GFX_VBEAF));
+ TOGGLE_MENU_ITEM(video_driver_linux_menu_vga, (menu_video_driver == GFX_VGA));
+ TOGGLE_MENU_ITEM(video_driver_linux_menu_vga_mode_x, (menu_video_driver == GFX_MODEX));
+ TOGGLE_MENU_ITEM(video_driver_linux_menu_vesa_vbe_af, (menu_video_driver == GFX_VBEAF));
#ifdef GFX_FBCON
- TOGGLE_MENU_ITEM(video_driver_linux_menu_framebuffer, (gfx_driver->id == GFX_FBCON));
+ TOGGLE_MENU_ITEM(video_driver_linux_menu_framebuffer, (menu_video_driver == GFX_FBCON));
#endif
#ifdef GFX_SVGALIB
- TOGGLE_MENU_ITEM(video_driver_linux_menu_svgalib, (gfx_driver->id == GFX_SVGALIB));
+ TOGGLE_MENU_ITEM(video_driver_linux_menu_svgalib, (menu_video_driver == GFX_SVGALIB));
#endif
#endif /* ALLEGRO_LINUX */
#ifdef ALLEGRO_UNIX
- TOGGLE_MENU_ITEM(video_driver_unix_menu_x_windows, (gfx_driver->id == GFX_XWINDOWS));
- TOGGLE_MENU_ITEM(video_driver_unix_menu_x_windows_full, (gfx_driver->id == GFX_XWINDOWS_FULLSCREEN));
- TOGGLE_MENU_ITEM(video_driver_unix_menu_x_dga, (gfx_driver->id == GFX_XDGA));
- TOGGLE_MENU_ITEM(video_driver_unix_menu_x_dga_full, (gfx_driver->id == GFX_XDGA_FULLSCREEN));
- TOGGLE_MENU_ITEM(video_driver_unix_menu_x_dga_2, (gfx_driver->id == GFX_XDGA2));
+ TOGGLE_MENU_ITEM(video_driver_unix_menu_x_windows, (menu_video_driver == GFX_XWINDOWS));
+ TOGGLE_MENU_ITEM(video_driver_unix_menu_x_windows_full, (menu_video_driver == GFX_XWINDOWS_FULLSCREEN));
+ TOGGLE_MENU_ITEM(video_driver_unix_menu_x_dga, (menu_video_driver == GFX_XDGA));
+ TOGGLE_MENU_ITEM(video_driver_unix_menu_x_dga_full, (menu_video_driver == GFX_XDGA_FULLSCREEN));
+ TOGGLE_MENU_ITEM(video_driver_unix_menu_x_dga_2, (menu_video_driver == GFX_XDGA2));
#endif /* ALLEGRO_UNIX */
#ifdef USE_ALLEGROGL
- TOGGLE_MENU_ITEM(video_driver_menu_opengl_full, (gfx_driver->id == GFX_OPENGL_FULLSCREEN));
- TOGGLE_MENU_ITEM(video_driver_menu_opengl_win, (gfx_driver->id == GFX_OPENGL_WINDOWED));
+ TOGGLE_MENU_ITEM(video_driver_menu_opengl, (menu_video_driver == GFX_OPENGL));
+ TOGGLE_MENU_ITEM(video_driver_menu_opengl_full, (menu_video_driver == GFX_OPENGL_FULLSCREEN));
+ TOGGLE_MENU_ITEM(video_driver_menu_opengl_win, (menu_video_driver == GFX_OPENGL_WINDOWED));
#endif /* USE_ALLEGROGL */
--- fakenes-0.5.8/src/video.c.driver 2006-04-24 22:27:32.000000000 +0200
+++ fakenes-0.5.8/src/video.c 2006-08-11 22:29:11.000000000 +0200
@@ -62,7 +62,13 @@
BOOL video_force_fullscreen = FALSE;
int video_cached_color_depth = 0; /* Read only. */
-int video_driver = 0;
+/* 2 versions of video driver "video_driver" contains the one actually used,
+ "menu_video_driver" contains the one configured by the user from the
+ menu, this can be different from the one actually used, because hot
+ switching between regular allegro drivers and alleggl drivers is not
+ supported. */
+static int video_driver = 0;
+int menu_video_driver = 0;
BITMAP *base_video_buffer = NULL;
BITMAP *video_buffer = NULL;
@@ -139,6 +145,7 @@
int width, height;
int result;
const CHAR *font_file;
+ static BOOL firsttime = TRUE;
log_printf ("VIDEO: Entering video_init().");
@@ -152,7 +159,15 @@
log_printf ("VIDEO: Loading configuration.");
- video_driver = get_config_id ("video", "driver", video_driver);
+ /* only load the video driver once, after the first time the config setting
+ will reflect menu_video_driver, and we will want to continue using the
+ real thing. */
+ if (firsttime)
+ {
+ video_driver = get_config_id ("video", "driver", video_driver);
+ menu_video_driver = video_driver;
+ firsttime = FALSE;
+ }
screen_width = get_config_int ("video", "screen_width", screen_width);
screen_height = get_config_int ("video", "screen_height", screen_height);
color_depth = get_config_int ("video", "color_depth", color_depth);
@@ -576,7 +591,7 @@
log_printf ("VIDEO: Saving configuration.");
- set_config_id ("video", "driver", video_driver);
+ set_config_id ("video", "driver", menu_video_driver);
set_config_int ("video", "screen_width", screen_width);
set_config_int ("video", "screen_height", screen_height);
set_config_int ("video", "color_depth", color_depth);
@@ -1639,13 +1654,29 @@
void video_set_driver (int driver)
{
int old_driver;
+#ifdef USE_ALLEGROGL
+ BOOL driver_is_opengl = (driver == GFX_OPENGL) ||
+ (driver == GFX_OPENGL_FULLSCREEN) ||
+ (driver == GFX_OPENGL_WINDOWED);
+#endif
-
- if (gfx_driver -> id == driver)
+ if (menu_video_driver == driver)
{
return;
}
+#ifdef USE_ALLEGROGL
+ if ((driver_is_opengl && !video_is_opengl_mode()) ||
+ (!driver_is_opengl && video_is_opengl_mode()))
+ {
+ gui_alert ("Notification",
+ "In order for the new driver",
+ "you've choisen to come into effect.",
+ "You must exit and restart fakenes.", "&OK", 0, 0, 0);
+ menu_video_driver = driver;
+ return;
+ }
+#endif /* USE_ALLEGROGL */
old_driver = gfx_driver -> id;
@@ -1673,6 +1704,11 @@
preserve_video_buffer = FALSE;
preserve_palette = FALSE;
+
+ if (video_driver == GFX_AUTODETECT)
+ menu_video_driver = GFX_AUTODETECT;
+ else
+ menu_video_driver = gfx_driver -> id;
}
--- fakenes-0.5.8/src/include/video.h.driver 2006-04-24 02:54:48.000000000 +0200
+++ fakenes-0.5.8/src/include/video.h 2006-08-11 22:29:11.000000000 +0200
@@ -49,7 +49,7 @@
BOOL video_force_fullscreen;
int video_cached_color_depth; /* Read only. */
-int video_driver;
+int menu_video_driver;
BITMAP *base_video_buffer;
BITMAP *video_buffer;
fakenes-0.5.8-menu-exit.patch:
--- NEW FILE fakenes-0.5.8-menu-exit.patch ---
--- fakenes-0.5.8/src/main.c.fixes 2006-08-11 11:25:48.000000000 +0200
+++ fakenes-0.5.8/src/main.c 2006-08-11 11:27:49.000000000 +0200
@@ -652,6 +649,8 @@
rest (0);
}
}
+ else /* If no rom was loaded and the menu exited, exit the emulator */
+ want_exit = TRUE;
}
--- NEW FILE fakenes.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Fakenes
Comment=Nintendo Entertainment System emulator
Exec=fakenes
Icon=fakenes.png
Terminal=false
Type=Application
Categories=Game;Emulator;
--- NEW FILE fakenes.spec ---
Name: fakenes
Version: 0.5.8
Release: 5%{?dist}
Summary: Nintendo Entertainment System emulator
Group: Amusements/Games
License: Artistic
URL: http://fakenes.sourceforge.net/
Source0: http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
Source1: %{name}.desktop
Patch0: fakenes-0.5.8-menu-exit.patch
Patch1: fakenes-0.5.8-driver-switch.patch
Patch2: fakenes-0.5.8-alutinit.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: allegro-devel alleggl-devel zlib-devel openal-devel
BuildRequires: libGLU-devel freealut-devel desktop-file-utils
Requires: hicolor-icon-theme
%description
FakeNES is an Open Source NES emulator. It uses the excellent Allegro
multimedia library for input, graphics, and sound effects/music across
various platforms. It is written in 100% C, and was originally designed to
run on DOS and Microsoft Windows, but now features a POSIX build system as
well. There are also official builds available for Mac OS X.
%prep
%setup -q
%patch0 -p1 -z .menu
%patch1 -p1 -z .driver
%patch2 -p1 -z .alutinit
sed -i 's/\r//' docs/faq.html
%build
export CFLAGS="$RPM_OPT_FLAGS -ffast-math"
make cbuild
./cbuild --verbose
%install
rm -rf $RPM_BUILD_ROOT
install -D -m 755 %{name} $RPM_BUILD_ROOT%{_bindir}/%{name}
# below is the desktop file and icon stuff.
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor dribble \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
%{SOURCE1}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
install -p -m 644 support/icon-32x32.png \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
%clean
rm -rf $RPM_BUILD_ROOT
%post
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%postun
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%files
%defattr(-, root, root)
%doc docs/CHANGES docs/LICENSE docs/README docs/faq.html
%{_bindir}/%{name}
%{_datadir}/applications/dribble-%{name}.desktop
%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
%changelog
* Thu Jul 24 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.5.8-5
- Release bump for rpmfusion
* Sat Mar 10 2007 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.5.8-4%{?dist}
- Fixup .desktop file categories for games-menus usage
* Sat Aug 12 2006 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.5.8-3%{?dist}
- Fix crash when using openAL sound and openAL couldn't open the audiodevice
* Fri Aug 11 2006 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.5.8-2%{?dist}
- Fix emulator hanging when pressing ESC in the main menu without a rom loaded
- Fix emulator crashing when switching between normal and opengl video modes
- Use %%{_bindir} instead of /usr/bin in %%install
* Thu Aug 3 2006 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.5.8-1%{?dist}
- Initial Fedora Extras package
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/fakenes/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 1 Jun 2008 11:39:09 -0000 1.1
+++ .cvsignore 24 Jul 2008 11:42:47 -0000 1.2
@@ -0,0 +1 @@
+fakenes-0.5.8.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/fakenes/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 1 Jun 2008 11:39:09 -0000 1.1
+++ sources 24 Jul 2008 11:42:47 -0000 1.2
@@ -0,0 +1 @@
+bc2650c42c63f18326d03e932245a787 fakenes-0.5.8.tar.bz2
16 years, 4 months
- 1
- 0
rpms/fakenes/F-9 fakenes-0.5.8-alutinit.patch, NONE, 1.1 fakenes-0.5.8-driver-switch.patch, NONE, 1.1 fakenes-0.5.8-menu-exit.patch, NONE, 1.1 fakenes.desktop, NONE, 1.1 fakenes.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/fakenes/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8429
Modified Files:
.cvsignore sources
Added Files:
fakenes-0.5.8-alutinit.patch fakenes-0.5.8-driver-switch.patch
fakenes-0.5.8-menu-exit.patch fakenes.desktop fakenes.spec
Log Message:
* Thu Jul 24 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.5.8-5
- Release bump for rpmfusion
fakenes-0.5.8-alutinit.patch:
--- NEW FILE fakenes-0.5.8-alutinit.patch ---
--- fakenes-0.5.8/src/audiolib.c.alutinit 2006-04-24 23:21:22.000000000 +0200
+++ fakenes-0.5.8/src/audiolib.c 2006-08-13 00:41:18.000000000 +0200
@@ -415,8 +415,13 @@
/* Interpolation is not supported. */
audio_interpolation = FALSE;
- alutInit (&saved_argc, saved_argv);
- AL_CHECK();
+ if(!alutInit (&saved_argc, saved_argv))
+ {
+ /* make sure other openal functions don't get called as that causes
+ crashes */
+ audiolib_driver = NULL;
+ return (1);
+ }
/* Autodetect settings. */
fakenes-0.5.8-driver-switch.patch:
--- NEW FILE fakenes-0.5.8-driver-switch.patch ---
--- fakenes-0.5.8/src/gui.c.driver 2006-04-26 15:20:24.000000000 +0200
+++ fakenes-0.5.8/src/gui.c 2006-08-11 22:30:57.000000000 +0200
@@ -237,55 +237,58 @@
TOGGLE_MENU_ITEM(audio_channels_menu_extended_2, dsp_get_channel_enabled (APU_CHANNEL_EXTRA_2));
TOGGLE_MENU_ITEM(audio_channels_menu_extended_3, dsp_get_channel_enabled (APU_CHANNEL_EXTRA_3));
+ TOGGLE_MENU_ITEM(video_driver_menu_automatic, (menu_video_driver == GFX_AUTODETECT));
+
#ifdef ALLEGRO_DOS
- TOGGLE_MENU_ITEM(video_driver_dos_menu_vga, (gfx_driver->id == GFX_VGA));
- TOGGLE_MENU_ITEM(video_driver_dos_menu_vga_mode_x, (gfx_driver->id == GFX_MODEX));
- TOGGLE_MENU_ITEM(video_driver_dos_menu_vesa, (gfx_driver->id == GFX_VESA1));
- TOGGLE_MENU_ITEM(video_driver_dos_menu_vesa_2_banked, (gfx_driver->id == GFX_VESA2B));
- TOGGLE_MENU_ITEM(video_driver_dos_menu_vesa_2_linear, (gfx_driver->id == GFX_VESA2L));
- TOGGLE_MENU_ITEM(video_driver_dos_menu_vesa_3, (gfx_driver->id == GFX_VESA3));
- TOGGLE_MENU_ITEM(video_driver_dos_menu_vesa_vbe_af, (gfx_driver->id == GFX_VBEAF));
+ TOGGLE_MENU_ITEM(video_driver_dos_menu_vga, (menu_video_driver == GFX_VGA));
+ TOGGLE_MENU_ITEM(video_driver_dos_menu_vga_mode_x, (menu_video_driver == GFX_MODEX));
+ TOGGLE_MENU_ITEM(video_driver_dos_menu_vesa, (menu_video_driver == GFX_VESA1));
+ TOGGLE_MENU_ITEM(video_driver_dos_menu_vesa_2_banked, (menu_video_driver == GFX_VESA2B));
+ TOGGLE_MENU_ITEM(video_driver_dos_menu_vesa_2_linear, (menu_video_driver == GFX_VESA2L));
+ TOGGLE_MENU_ITEM(video_driver_dos_menu_vesa_3, (menu_video_driver == GFX_VESA3));
+ TOGGLE_MENU_ITEM(video_driver_dos_menu_vesa_vbe_af, (menu_video_driver == GFX_VBEAF));
#endif /* ALLEGRO_DOS */
#ifdef ALLEGRO_WINDOWS
- TOGGLE_MENU_ITEM(video_driver_windows_menu_directx, (gfx_driver->id == GFX_DIRECTX));
- TOGGLE_MENU_ITEM(video_driver_windows_menu_directx_window, (gfx_driver->id == GFX_DIRECTX_WIN));
- TOGGLE_MENU_ITEM(video_driver_windows_menu_directx_overlay, (gfx_driver->id == GFX_DIRECTX_OVL));
- TOGGLE_MENU_ITEM(video_driver_windows_menu_gdi, (gfx_driver->id == GFX_GDI));
+ TOGGLE_MENU_ITEM(video_driver_windows_menu_directx, (menu_video_driver == GFX_DIRECTX));
+ TOGGLE_MENU_ITEM(video_driver_windows_menu_directx_window, (menu_video_driver == GFX_DIRECTX_WIN));
+ TOGGLE_MENU_ITEM(video_driver_windows_menu_directx_overlay, (menu_video_driver == GFX_DIRECTX_OVL));
+ TOGGLE_MENU_ITEM(video_driver_windows_menu_gdi, (menu_video_driver == GFX_GDI));
#endif /* ALLEGRO_WINDOWS */
#ifdef ALLEGRO_LINUX
- TOGGLE_MENU_ITEM(video_driver_linux_menu_vga, (gfx_driver->id == GFX_VGA));
- TOGGLE_MENU_ITEM(video_driver_linux_menu_vga_mode_x, (gfx_driver->id == GFX_MODEX));
- TOGGLE_MENU_ITEM(video_driver_linux_menu_vesa_vbe_af, (gfx_driver->id == GFX_VBEAF));
+ TOGGLE_MENU_ITEM(video_driver_linux_menu_vga, (menu_video_driver == GFX_VGA));
+ TOGGLE_MENU_ITEM(video_driver_linux_menu_vga_mode_x, (menu_video_driver == GFX_MODEX));
+ TOGGLE_MENU_ITEM(video_driver_linux_menu_vesa_vbe_af, (menu_video_driver == GFX_VBEAF));
#ifdef GFX_FBCON
- TOGGLE_MENU_ITEM(video_driver_linux_menu_framebuffer, (gfx_driver->id == GFX_FBCON));
+ TOGGLE_MENU_ITEM(video_driver_linux_menu_framebuffer, (menu_video_driver == GFX_FBCON));
#endif
#ifdef GFX_SVGALIB
- TOGGLE_MENU_ITEM(video_driver_linux_menu_svgalib, (gfx_driver->id == GFX_SVGALIB));
+ TOGGLE_MENU_ITEM(video_driver_linux_menu_svgalib, (menu_video_driver == GFX_SVGALIB));
#endif
#endif /* ALLEGRO_LINUX */
#ifdef ALLEGRO_UNIX
- TOGGLE_MENU_ITEM(video_driver_unix_menu_x_windows, (gfx_driver->id == GFX_XWINDOWS));
- TOGGLE_MENU_ITEM(video_driver_unix_menu_x_windows_full, (gfx_driver->id == GFX_XWINDOWS_FULLSCREEN));
- TOGGLE_MENU_ITEM(video_driver_unix_menu_x_dga, (gfx_driver->id == GFX_XDGA));
- TOGGLE_MENU_ITEM(video_driver_unix_menu_x_dga_full, (gfx_driver->id == GFX_XDGA_FULLSCREEN));
- TOGGLE_MENU_ITEM(video_driver_unix_menu_x_dga_2, (gfx_driver->id == GFX_XDGA2));
+ TOGGLE_MENU_ITEM(video_driver_unix_menu_x_windows, (menu_video_driver == GFX_XWINDOWS));
+ TOGGLE_MENU_ITEM(video_driver_unix_menu_x_windows_full, (menu_video_driver == GFX_XWINDOWS_FULLSCREEN));
+ TOGGLE_MENU_ITEM(video_driver_unix_menu_x_dga, (menu_video_driver == GFX_XDGA));
+ TOGGLE_MENU_ITEM(video_driver_unix_menu_x_dga_full, (menu_video_driver == GFX_XDGA_FULLSCREEN));
+ TOGGLE_MENU_ITEM(video_driver_unix_menu_x_dga_2, (menu_video_driver == GFX_XDGA2));
#endif /* ALLEGRO_UNIX */
#ifdef USE_ALLEGROGL
- TOGGLE_MENU_ITEM(video_driver_menu_opengl_full, (gfx_driver->id == GFX_OPENGL_FULLSCREEN));
- TOGGLE_MENU_ITEM(video_driver_menu_opengl_win, (gfx_driver->id == GFX_OPENGL_WINDOWED));
+ TOGGLE_MENU_ITEM(video_driver_menu_opengl, (menu_video_driver == GFX_OPENGL));
+ TOGGLE_MENU_ITEM(video_driver_menu_opengl_full, (menu_video_driver == GFX_OPENGL_FULLSCREEN));
+ TOGGLE_MENU_ITEM(video_driver_menu_opengl_win, (menu_video_driver == GFX_OPENGL_WINDOWED));
#endif /* USE_ALLEGROGL */
--- fakenes-0.5.8/src/video.c.driver 2006-04-24 22:27:32.000000000 +0200
+++ fakenes-0.5.8/src/video.c 2006-08-11 22:29:11.000000000 +0200
@@ -62,7 +62,13 @@
BOOL video_force_fullscreen = FALSE;
int video_cached_color_depth = 0; /* Read only. */
-int video_driver = 0;
+/* 2 versions of video driver "video_driver" contains the one actually used,
+ "menu_video_driver" contains the one configured by the user from the
+ menu, this can be different from the one actually used, because hot
+ switching between regular allegro drivers and alleggl drivers is not
+ supported. */
+static int video_driver = 0;
+int menu_video_driver = 0;
BITMAP *base_video_buffer = NULL;
BITMAP *video_buffer = NULL;
@@ -139,6 +145,7 @@
int width, height;
int result;
const CHAR *font_file;
+ static BOOL firsttime = TRUE;
log_printf ("VIDEO: Entering video_init().");
@@ -152,7 +159,15 @@
log_printf ("VIDEO: Loading configuration.");
- video_driver = get_config_id ("video", "driver", video_driver);
+ /* only load the video driver once, after the first time the config setting
+ will reflect menu_video_driver, and we will want to continue using the
+ real thing. */
+ if (firsttime)
+ {
+ video_driver = get_config_id ("video", "driver", video_driver);
+ menu_video_driver = video_driver;
+ firsttime = FALSE;
+ }
screen_width = get_config_int ("video", "screen_width", screen_width);
screen_height = get_config_int ("video", "screen_height", screen_height);
color_depth = get_config_int ("video", "color_depth", color_depth);
@@ -576,7 +591,7 @@
log_printf ("VIDEO: Saving configuration.");
- set_config_id ("video", "driver", video_driver);
+ set_config_id ("video", "driver", menu_video_driver);
set_config_int ("video", "screen_width", screen_width);
set_config_int ("video", "screen_height", screen_height);
set_config_int ("video", "color_depth", color_depth);
@@ -1639,13 +1654,29 @@
void video_set_driver (int driver)
{
int old_driver;
+#ifdef USE_ALLEGROGL
+ BOOL driver_is_opengl = (driver == GFX_OPENGL) ||
+ (driver == GFX_OPENGL_FULLSCREEN) ||
+ (driver == GFX_OPENGL_WINDOWED);
+#endif
-
- if (gfx_driver -> id == driver)
+ if (menu_video_driver == driver)
{
return;
}
+#ifdef USE_ALLEGROGL
+ if ((driver_is_opengl && !video_is_opengl_mode()) ||
+ (!driver_is_opengl && video_is_opengl_mode()))
+ {
+ gui_alert ("Notification",
+ "In order for the new driver",
+ "you've choisen to come into effect.",
+ "You must exit and restart fakenes.", "&OK", 0, 0, 0);
+ menu_video_driver = driver;
+ return;
+ }
+#endif /* USE_ALLEGROGL */
old_driver = gfx_driver -> id;
@@ -1673,6 +1704,11 @@
preserve_video_buffer = FALSE;
preserve_palette = FALSE;
+
+ if (video_driver == GFX_AUTODETECT)
+ menu_video_driver = GFX_AUTODETECT;
+ else
+ menu_video_driver = gfx_driver -> id;
}
--- fakenes-0.5.8/src/include/video.h.driver 2006-04-24 02:54:48.000000000 +0200
+++ fakenes-0.5.8/src/include/video.h 2006-08-11 22:29:11.000000000 +0200
@@ -49,7 +49,7 @@
BOOL video_force_fullscreen;
int video_cached_color_depth; /* Read only. */
-int video_driver;
+int menu_video_driver;
BITMAP *base_video_buffer;
BITMAP *video_buffer;
fakenes-0.5.8-menu-exit.patch:
--- NEW FILE fakenes-0.5.8-menu-exit.patch ---
--- fakenes-0.5.8/src/main.c.fixes 2006-08-11 11:25:48.000000000 +0200
+++ fakenes-0.5.8/src/main.c 2006-08-11 11:27:49.000000000 +0200
@@ -652,6 +649,8 @@
rest (0);
}
}
+ else /* If no rom was loaded and the menu exited, exit the emulator */
+ want_exit = TRUE;
}
--- NEW FILE fakenes.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Fakenes
Comment=Nintendo Entertainment System emulator
Exec=fakenes
Icon=fakenes.png
Terminal=false
Type=Application
Categories=Game;Emulator;
--- NEW FILE fakenes.spec ---
Name: fakenes
Version: 0.5.8
Release: 5%{?dist}
Summary: Nintendo Entertainment System emulator
Group: Amusements/Games
License: Artistic
URL: http://fakenes.sourceforge.net/
Source0: http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
Source1: %{name}.desktop
Patch0: fakenes-0.5.8-menu-exit.patch
Patch1: fakenes-0.5.8-driver-switch.patch
Patch2: fakenes-0.5.8-alutinit.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: allegro-devel alleggl-devel zlib-devel openal-devel
BuildRequires: libGLU-devel freealut-devel desktop-file-utils
Requires: hicolor-icon-theme
%description
FakeNES is an Open Source NES emulator. It uses the excellent Allegro
multimedia library for input, graphics, and sound effects/music across
various platforms. It is written in 100% C, and was originally designed to
run on DOS and Microsoft Windows, but now features a POSIX build system as
well. There are also official builds available for Mac OS X.
%prep
%setup -q
%patch0 -p1 -z .menu
%patch1 -p1 -z .driver
%patch2 -p1 -z .alutinit
sed -i 's/\r//' docs/faq.html
%build
export CFLAGS="$RPM_OPT_FLAGS -ffast-math"
make cbuild
./cbuild --verbose
%install
rm -rf $RPM_BUILD_ROOT
install -D -m 755 %{name} $RPM_BUILD_ROOT%{_bindir}/%{name}
# below is the desktop file and icon stuff.
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor dribble \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
%{SOURCE1}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
install -p -m 644 support/icon-32x32.png \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
%clean
rm -rf $RPM_BUILD_ROOT
%post
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%postun
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%files
%defattr(-, root, root)
%doc docs/CHANGES docs/LICENSE docs/README docs/faq.html
%{_bindir}/%{name}
%{_datadir}/applications/dribble-%{name}.desktop
%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
%changelog
* Thu Jul 24 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.5.8-5
- Release bump for rpmfusion
* Sat Mar 10 2007 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.5.8-4%{?dist}
- Fixup .desktop file categories for games-menus usage
* Sat Aug 12 2006 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.5.8-3%{?dist}
- Fix crash when using openAL sound and openAL couldn't open the audiodevice
* Fri Aug 11 2006 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.5.8-2%{?dist}
- Fix emulator hanging when pressing ESC in the main menu without a rom loaded
- Fix emulator crashing when switching between normal and opengl video modes
- Use %%{_bindir} instead of /usr/bin in %%install
* Thu Aug 3 2006 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.5.8-1%{?dist}
- Initial Fedora Extras package
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/fakenes/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 1 Jun 2008 11:39:09 -0000 1.1
+++ .cvsignore 24 Jul 2008 11:41:54 -0000 1.2
@@ -0,0 +1 @@
+fakenes-0.5.8.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/fakenes/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 1 Jun 2008 11:39:09 -0000 1.1
+++ sources 24 Jul 2008 11:41:54 -0000 1.2
@@ -0,0 +1 @@
+bc2650c42c63f18326d03e932245a787 fakenes-0.5.8.tar.bz2
16 years, 4 months
- 1
- 0