Dear mentors, I am looking for a sponsor for the new version 1.5+dfsg1-8 of my package "mupen64plus".
It builds these binary packages: mupen64plus - plugin-based Nintendo 64 emulator mupen64plus-dbg - mupen64plus debug symbols package The package appears to be lintian clean. The package can be found on mentors.debian.net: - URL: http://mentors.debian.net/debian/pool/main/m/mupen64plus - Source repository: deb-src http://mentors.debian.net/debian unstable main contrib non-free - dget http://mentors.debian.net/debian/pool/main/m/mupen64plus/mupen64plus_1.5+dfsg1-8.dsc - debcheckout --git-track="*" mupen64plus The commit is debian/1.5+dfsg1-7-12-gc3e740f and will be tagged as debian/1.5+dfsg1-8 later I would be glad if someone uploaded this package for me. About the changes: * debian/patches: - Add rice_fog.patch, Reduce flickering when enabling fog in rice - Update fix_readpng.patch, Fix FTBFS with libpng14 and remove coding style only changes * Convert to 3.0 (quilt) source format * Remove outdated README.source * debian/control: - Remove shlibs:Depends for binary packages without shared libs dependencies - Remove unneeded build dependency to quilt - Upgraded to policy 3.8.4, no changes required * Correct spelling errors found by lintian * debian/copyright: Update copyright years * Check all files ever published on the download page in debian/watch Most things are only smaller changes I had lying around on my harddrive for a while. The most important change is the switch to 3.0 (quilt) format which also removes the dependency to quilt. Also the change to fix_readpng.patch makes it build again with libpng14 for a future transition (no package for that available in debian unstable or experimental - see #565821). The rest is just the usual housekeeping stuff. The next upload will probably one from the modular 2.x series - but not be for squeeze. Best regards, Sven
diff -Nru mupen64plus-1.5+dfsg1/debian/changelog mupen64plus-1.5+dfsg1/debian/changelog
--- mupen64plus-1.5+dfsg1/debian/changelog 2010-03-15 16:45:19.000000000 +0100
+++ mupen64plus-1.5+dfsg1/debian/changelog 2010-03-15 16:22:12.000000000 +0100
@@ -1,3 +1,21 @@
+mupen64plus (1.5+dfsg1-8) unstable; urgency=low
+
+ * debian/patches:
+ - Add rice_fog.patch, Reduce flickering when enabling fog in rice
+ - Update fix_readpng.patch, Fix FTBFS with libpng14 and remove coding style
+ only changes
+ * Convert to 3.0 (quilt) source format
+ * Remove outdated README.source
+ * debian/control:
+ - Remove shlibs:Depends for binary packages without shared libs dependencies
+ - Remove unneeded build dependency to quilt
+ - Upgraded to policy 3.8.4, no changes required
+ * Correct spelling errors found by lintian
+ * debian/copyright: Update copyright years
+ * Check all files ever published on the download page in debian/watch
+
+ -- Sven Eckelmann <sven.eckelm...@gmx.de> Mon, 15 Mar 2010 16:22:03 +0100
+
mupen64plus (1.5+dfsg1-7) unstable; urgency=low
* debian/patches:
@@ -102,7 +120,7 @@
specification
* debian/rules:
- Disable assembler optimized parts on unsupported architectures
- * Add README.source with informations about patch management
+ * Add README.source with information about patch management
* Add NEWS.Debian with information about migration of old data and
configuration to new xdg compliant directories
diff -Nru mupen64plus-1.5+dfsg1/debian/control mupen64plus-1.5+dfsg1/debian/control
--- mupen64plus-1.5+dfsg1/debian/control 2010-03-15 16:45:19.000000000 +0100
+++ mupen64plus-1.5+dfsg1/debian/control 2010-03-15 16:22:12.000000000 +0100
@@ -4,15 +4,14 @@
Maintainer: Tobias Loose <tobiaslo...@gmx.de>
Uploaders: Sven Eckelmann <sven.eckelm...@gmx.de>
Homepage: http://code.google.com/p/mupen64plus/
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
Vcs-Browser: http://git.debian.org/?p=collab-maint/mupen64plus.git
Vcs-Git: git://git.debian.org/git/collab-maint/mupen64plus.git
-Build-Depends: debhelper (>= 7.0.50), quilt (>= 0.46-7), libsdl1.2-dev,
- libsdl-ttf2.0-dev, libfreetype6-dev, libglib2.0-dev, libgtk2.0-dev,
- libsamplerate0-dev, libpng12-dev | libpng-dev, libbz2-dev,
- zlib1g-dev | libz-dev, libgl1-mesa-dev | libgl-dev,
- libglu1-mesa-dev | libglu-dev, binutils-dev, pkg-config, liblzma-dev,
- libxdg-basedir-dev
+Build-Depends: debhelper (>= 7.0.50), libsdl1.2-dev, libsdl-ttf2.0-dev,
+ libfreetype6-dev, libglib2.0-dev, libgtk2.0-dev, libsamplerate0-dev,
+ libpng12-dev | libpng-dev, libbz2-dev, zlib1g-dev | libz-dev,
+ libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, binutils-dev,
+ pkg-config, liblzma-dev, libxdg-basedir-dev
Package: mupen64plus
Architecture: any
@@ -33,7 +32,7 @@
Section: debug
Priority: extra
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends},
+Depends: ${misc:Depends},
mupen64plus (= ${binary:Version})
Description: mupen64plus debug symbols package
N64 Emulator for Linux that works with many ROMs that are publically available.
diff -Nru mupen64plus-1.5+dfsg1/debian/copyright mupen64plus-1.5+dfsg1/debian/copyright
--- mupen64plus-1.5+dfsg1/debian/copyright 2010-03-15 16:45:19.000000000 +0100
+++ mupen64plus-1.5+dfsg1/debian/copyright 2010-03-15 16:22:12.000000000 +0100
@@ -526,8 +526,8 @@
Files: debian/*
Copyright: 2009, Félix Arreola Rodríguez <fgatuno....@gmail.com>
- 2009, Sven Eckelmann <sven.eckelm...@gmx.de>
- 2009, Tobias Loose <tobiaslo...@gmx.de>
+ 2009-2010, Sven Eckelmann <sven.eckelm...@gmx.de>
+ 2009-2010, Tobias Loose <tobiaslo...@gmx.de>
License: GPL-2+
License: GPL-2+
diff -Nru mupen64plus-1.5+dfsg1/debian/patches/correct_fpr32_mapping.patch mupen64plus-1.5+dfsg1/debian/patches/correct_fpr32_mapping.patch
--- mupen64plus-1.5+dfsg1/debian/patches/correct_fpr32_mapping.patch 2010-03-15 16:45:19.000000000 +0100
+++ mupen64plus-1.5+dfsg1/debian/patches/correct_fpr32_mapping.patch 2010-03-15 16:22:12.000000000 +0100
@@ -10,7 +10,7 @@
bit wide FGRs gets saved and before a save and after a load of a savestate a
sync of both is forced.
.
- More informations about these registers can be found in
+ More information about these registers can be found in
* Charles Brice, "MIPS IV Instruction Set" Rev. 3.2, September 1995 in
"B.3 Floating-Point Registers".
* Joe Heinrich, "MIPS R4000 Microprocessor User’s Manual", Second Edition in
diff -Nru mupen64plus-1.5+dfsg1/debian/patches/fix_readpng.patch mupen64plus-1.5+dfsg1/debian/patches/fix_readpng.patch
--- mupen64plus-1.5+dfsg1/debian/patches/fix_readpng.patch 2010-03-15 16:45:19.000000000 +0100
+++ mupen64plus-1.5+dfsg1/debian/patches/fix_readpng.patch 2010-03-15 16:22:12.000000000 +0100
@@ -10,7 +10,7 @@
---
diff --git a/rice_video/liblinux/bmp.c b/rice_video/liblinux/bmp.c
-index 13c66fdc427c6fc94bff5e3434a1067199d7353f..e1e821db0ec45854faff4c0710195b759b423741 100644
+index 13c66fdc427c6fc94bff5e3434a1067199d7353f..f941b2cff8d2a6731d2eca7d8493343ab74b9312 100644
--- a/rice_video/liblinux/bmp.c
+++ b/rice_video/liblinux/bmp.c
@@ -205,18 +205,18 @@ err_jmp:
@@ -35,36 +35,8 @@
BITMAPFILEHEADER bmfh;
BITMAPINFOHEADER bmih;
-@@ -224,17 +224,17 @@ BMGError WriteBMP( const char *filename,
- SetLastBMGError( BMG_OK );
-
- /* error handler */
-- error = setjmp( err_jmp );
-- if ( error != 0 )
-+ error = setjmp(err_jmp);
-+ if (error != 0)
- {
-- if ( file != NULL )
-- fclose( file );
-- if ( bits != NULL )
-- free( bits );
-- if ( pColor != NULL )
-- free( pColor );
-- SetLastBMGError( (BMGError)error );
-- return (BMGError)error;
-+ if (file != NULL)
-+ fclose(file);
-+ if (bits != NULL)
-+ free(bits);
-+ if (pColor != NULL)
-+ free(pColor);
-+ SetLastBMGError((BMGError)error);
-+ return (BMGError) error;
- }
-
- if ( img.bits == NULL )
diff --git a/rice_video/liblinux/pngrw.c b/rice_video/liblinux/pngrw.c
-index 673741adbc1d75499100624572a6512fdefd39dc..c564727dbe56dbce59aa69212d46913f89a45e8a 100644
+index 673741adbc1d75499100624572a6512fdefd39dc..8a103e7aefd10c50c542727310b6efe82c8fda2f 100644
--- a/rice_video/liblinux/pngrw.c
+++ b/rice_video/liblinux/pngrw.c
@@ -94,12 +94,12 @@ Comments:
@@ -106,44 +78,42 @@
int NumColors = 0;
unsigned char BgdRed = 0;
unsigned char BgdGreen = 0;
-@@ -130,20 +131,26 @@ BMGError ReadPNG( const char *filename,
-
- /* error handler */
+@@ -132,16 +133,22 @@ BMGError ReadPNG( const char *filename,
error = setjmp( err_jmp );
-- if ( error != 0 )
-+ if (error != 0)
+ if ( error != 0 )
{
- if ( png_ptr != NULL )
- png_destroy_read_struct( &png_ptr, NULL, NULL );
-- if ( rows )
-+ if (end_info != NULL)
++ if ( end_info != NULL )
+ png_destroy_read_struct((png_structp *) &png_ptr, (png_infop *) &info_ptr, (png_infop *) &end_info);
+ else if (info_ptr != NULL)
-+ png_destroy_read_struct((png_structp *) &png_ptr, (png_infop *) &info_ptr, png_infopp_NULL);
++ png_destroy_read_struct((png_structp *) &png_ptr, (png_infop *) &info_ptr, NULL);
+ else if (png_ptr != NULL)
-+ png_destroy_read_struct((png_structp *) &png_ptr, png_infopp_NULL, png_infopp_NULL);
-+ if (rows)
++ png_destroy_read_struct((png_structp *) &png_ptr, NULL, NULL);
+ if ( rows )
{
-- if ( rows[0] )
-- free( rows[0] );
-- free( rows );
-+ if (rows[0])
-+ free(rows[0]);
-+ free(rows);
+ if ( rows[0] )
+ free( rows[0] );
+ free( rows );
}
- FreeBMGImage( img );
- fclose( file );
-- SetLastBMGError( (BMGError)error );
-- return (BMGError)error;
+ if (img)
+ FreeBMGImage(img);
+ if (file)
+ fclose(file);
-+ SetLastBMGError((BMGError) error);
-+ return (BMGError) error;
+ SetLastBMGError( (BMGError)error );
+ return (BMGError)error;
}
+@@ -155,7 +162,7 @@ BMGError ReadPNG( const char *filename,
+
+ /* check the signature */
+ fread( signature, 1, 8, file );
+- if ( !png_check_sig( signature, 8 ) )
++ if ( png_sig_cmp( signature, 0, 8 ) )
+ longjmp( err_jmp, (int)errUnsupportedFileFormat );
- if ( img == NULL )
+ /* create a pointer to the png read structure */
@@ -163,6 +170,16 @@ BMGError ReadPNG( const char *filename,
if ( !png_ptr )
longjmp( err_jmp, (int)errMemoryAllocation );
@@ -173,15 +143,6 @@
/* attach file buffer to the png read pointer */
png_init_io( png_ptr, file );
-@@ -187,7 +199,7 @@ BMGError ReadPNG( const char *filename,
-
- /* extract the data we need to form the HBITMAP from the PNG header */
- png_get_IHDR( png_ptr, info_ptr, &Width, &Height, &BitDepth, &ColorType,
-- &InterlaceType, NULL, NULL );
-+ &InterlaceType, int_p_NULL, int_p_NULL);
-
- img->width = Width;
- img->height = Height;
@@ -475,7 +487,7 @@ BMGError ReadPNG( const char *filename,
free( rows[0] );
free( rows );
diff -Nru mupen64plus-1.5+dfsg1/debian/patches/rice_fog.patch mupen64plus-1.5+dfsg1/debian/patches/rice_fog.patch
--- mupen64plus-1.5+dfsg1/debian/patches/rice_fog.patch 1970-01-01 01:00:00.000000000 +0100
+++ mupen64plus-1.5+dfsg1/debian/patches/rice_fog.patch 2010-03-15 16:22:12.000000000 +0100
@@ -0,0 +1,22 @@
+Description: Reduce flickering when enabling fog in rice
+ When enabling fog in rice video plugin some polygons near the camera starts to
+ flicker, turn to white or disappear completely. This happens due to negative
+ fog coords send to OpenGL. This is invalid and should be clamped to 0.0 in that
+ case.
+Bug: http://code.google.com/p/mupen64plus/issues/detail?id=30
+Author: Jonathan Kleinehellefort <j...@molb.org>
+
+---
+diff --git a/rice_video/RenderBase.cpp b/rice_video/RenderBase.cpp
+index a5dcc2e716c8b5ea9c4a88bdf70815f4a2912ce4..16372271c500872abc7e9ed6fba4482ed7ce1a99 100644
+--- a/rice_video/RenderBase.cpp
++++ b/rice_video/RenderBase.cpp
+@@ -854,7 +854,7 @@ void InitVertex(uint32 dwV, uint32 vtxIndex, bool bTexture, bool openGL)
+ g_vtxProjected5[vtxIndex][1] = g_vtxTransformed[dwV].y;
+ g_vtxProjected5[vtxIndex][2] = g_vtxTransformed[dwV].z;
+ g_vtxProjected5[vtxIndex][3] = g_vtxTransformed[dwV].w;
+- g_vtxProjected5[vtxIndex][4] = g_vecProjected[dwV].z;
++ g_vtxProjected5[vtxIndex][4] = max(0.0, g_vecProjected[dwV].z);
+
+ if( g_vtxTransformed[dwV].w < 0 ) g_vtxProjected5[vtxIndex][4] = 0;
+ g_vtxIndex[vtxIndex] = vtxIndex;
diff -Nru mupen64plus-1.5+dfsg1/debian/patches/series mupen64plus-1.5+dfsg1/debian/patches/series
--- mupen64plus-1.5+dfsg1/debian/patches/series 2010-03-15 16:45:19.000000000 +0100
+++ mupen64plus-1.5+dfsg1/debian/patches/series 2010-03-15 16:22:12.000000000 +0100
@@ -34,3 +34,4 @@
resume_on_start.patch
osd-pause-crash.patch
system-liblzma.patch
+rice_fog.patch
diff -Nru mupen64plus-1.5+dfsg1/debian/README.source mupen64plus-1.5+dfsg1/debian/README.source
--- mupen64plus-1.5+dfsg1/debian/README.source 2010-03-15 16:45:19.000000000 +0100
+++ mupen64plus-1.5+dfsg1/debian/README.source 1970-01-01 01:00:00.000000000 +0100
@@ -1,8 +0,0 @@
-This package uses quilt to manage all modifications to the upstream
-source. Changes are stored in the source package as diffs in
-debian/patches and applied during the build. Please see:
-
- /usr/share/doc/quilt/README.source
-
-for more information on how to apply the patches, modify patches, or
-remove a patch.
diff -Nru mupen64plus-1.5+dfsg1/debian/rules mupen64plus-1.5+dfsg1/debian/rules
--- mupen64plus-1.5+dfsg1/debian/rules 2010-03-15 16:45:19.000000000 +0100
+++ mupen64plus-1.5+dfsg1/debian/rules 2010-03-15 16:22:12.000000000 +0100
@@ -4,7 +4,7 @@
DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
%:
- dh --with quilt $@
+ dh $@
get-orig-source:
uscan --verbose --force-download
@@ -12,7 +12,7 @@
clean:
mkdir -p "$(CURDIR)/glN64"
cp "$(CURDIR)/debian/Makefile.glN64" "$(CURDIR)/glN64/Makefile"
- dh --with quilt $@
+ dh $@
rm -rf "$(CURDIR)/glN64"
rm -rf "$(CURDIR)/plugins"
diff -Nru mupen64plus-1.5+dfsg1/debian/source/format mupen64plus-1.5+dfsg1/debian/source/format
--- mupen64plus-1.5+dfsg1/debian/source/format 1970-01-01 01:00:00.000000000 +0100
+++ mupen64plus-1.5+dfsg1/debian/source/format 2010-03-15 16:45:20.093104255 +0100
@@ -0,0 +1 @@
+3.0 (quilt)
diff -Nru mupen64plus-1.5+dfsg1/debian/watch mupen64plus-1.5+dfsg1/debian/watch
--- mupen64plus-1.5+dfsg1/debian/watch 2010-03-15 16:45:19.000000000 +0100
+++ mupen64plus-1.5+dfsg1/debian/watch 2010-03-15 16:22:12.000000000 +0100
@@ -1,6 +1,6 @@
version=3
opts="uversionmangle=s/-/./,dversionmangle=s/\+dfsg\d+$//" \
-http://code.google.com/p/mupen64plus/downloads/list \
+http://code.google.com/p/mupen64plus/downloads/list?can=1 \
http://mupen64plus.googlecode.com/files/Mupen64Plus-(.*).src\.tar.gz \
debian debian/prune-tarball.sh
signature.asc
Description: This is a digitally signed message part.
