diff options
author | 2015-08-08 13:49:04 -0700 | |
---|---|---|
committer | 2015-08-08 17:38:18 -0700 | |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /games-emulation/mupen64plus/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'games-emulation/mupen64plus/files')
6 files changed, 221 insertions, 0 deletions
diff --git a/games-emulation/mupen64plus/files/README.gentoo-patches-20091123 b/games-emulation/mupen64plus/files/README.gentoo-patches-20091123 new file mode 100644 index 000000000000..96994d798b7a --- /dev/null +++ b/games-emulation/mupen64plus/files/README.gentoo-patches-20091123 @@ -0,0 +1,55 @@ +All patches below 500 are from the Debian git repository (Nov 23 12:35 CET 2009): + +http://git.debian.org/?p=collab-maint/mupen64plus.git;a=tree;f=debian/patches;hb=master + +Patches included: +================= + +fix-desktop-file.patch +destdir.patch +dejavu-font.patch +as-needed.patch +system-libpng.patch +system-zlib.patch +system-libbz2.patch +remove-gln64.patch +remove-nondfsg-icons.patch +glide64-noasm.patch +rice-texturepack-crash.patch +rice-screenflickering.patch +static-binutils-libs.patch +fix-7z-subfolder.patch +ftbfs-dynarec.patch +ftbfs-kfreebsd.patch +ftbfs-debugger.patch +debian-archs.patch +ftbfs-glibc210.patch +version-string.patch +default-optimisations.patch +gtk-open-filter.patch +noexecstack.patch +fix_readpng.patch +jttl_fix_romclosed.patch +rice_nodebug.patch +interpreter_x86_fldcw.patch +correct_fpr32_mapping.patch +load_aidacrate.patch +load_vistatus.patch +fix_r0_override.patch +resume_on_start.patch +osd-pause-crash.patch +system-liblzma.patch +- system-liblzma got changed to work without the droped xdg-basedir.patch + +Patches excluded: +================= + +plugin-searchpath.patch +xdg-basedir.patch +- Because Gentoo uses different locations like /usr/games/lib(64) and /usr/share/games. + The usage of xdg patch location standards would ne nice though. + +A big thanks to all the authors of the patches. + +Have fun +Christian Birchinger <joker@gentoo.org> diff --git a/games-emulation/mupen64plus/files/README.gentoo-patches-20100507 b/games-emulation/mupen64plus/files/README.gentoo-patches-20100507 new file mode 100644 index 000000000000..e6b857a07d48 --- /dev/null +++ b/games-emulation/mupen64plus/files/README.gentoo-patches-20100507 @@ -0,0 +1,59 @@ +All patches below 500 are from the Debian git repository (May 07 2010): + +http://git.debian.org/?p=collab-maint/mupen64plus.git;a=tree;f=debian/patches;hb=master + +Patches included: +================= + +fix-desktop-file.patch +destdir.patch +- dejavu-font.patch adjusted the font path to the font location on Gentoo systems +as-needed.patch +system-libpng.patch +system-zlib.patch +system-libbz2.patch +remove-gln64.patch +remove-nondfsg-icons.patch +glide64-noasm.patch +rice-texturepack-crash.patch +rice-screenflickering.patch +static-binutils-libs.patch +fix-7z-subfolder.patch +ftbfs-dynarec.patch +ftbfs-kfreebsd.patch +ftbfs-debugger.patch +debian-archs.patch +ftbfs-glibc210.patch +version-string.patch +default-optimisations.patch +gtk-open-filter.patch +noexecstack.patch +fix_readpng.patch +jttl_fix_romclosed.patch +rice_nodebug.patch +interpreter_x86_fldcw.patch +correct_fpr32_mapping.patch +load_aidacrate.patch +load_vistatus.patch +fix_r0_override.patch +resume_on_start.patch +osd-pause-crash.patch +system-liblzma.patch +ftbfs-gvariant-type-conflicts.path +rsp_ucode2_reset.patch +rsp_hle_bigendian.patch +rice-crash-vendorstring.patch +- system-liblzma got changed to work without the droped xdg-basedir.patch + +Patches excluded: +================= + +plugin-searchpath.patch +xdg-basedir.patch +- Because Gentoo uses different locations like /usr/games/lib(64) and /usr/share/games. + The usage of xdg patch location standards would ne nice though. + +A big thanks to all the authors of the patches. + +Have fun +Christian Birchinger <joker@gentoo.org> diff --git a/games-emulation/mupen64plus/files/ftbfs-gvariant-type-conflicts.patch b/games-emulation/mupen64plus/files/ftbfs-gvariant-type-conflicts.patch new file mode 100644 index 000000000000..e76da1707285 --- /dev/null +++ b/games-emulation/mupen64plus/files/ftbfs-gvariant-type-conflicts.patch @@ -0,0 +1,27 @@ +Description: Fix FTBFS due to glib gvariant type definitions +Forwarded: not-needed +Bug-Debian: http://bugs.debian.org/577329 +Author: Sven Eckelmann <sven.eckelmann@gmx.de> + +--- +diff --git a/rice_video/typedefs.h b/rice_video/typedefs.h +index 4cded542b06445f043fa1fabf77e4d20c9d52920..b7e16e9c4ba3248f9fed9762f79349c137ee2026 100644 +--- a/rice_video/typedefs.h ++++ b/rice_video/typedefs.h +@@ -20,10 +20,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + #ifndef _TYPEDEFS_H_ + #define _TYPEDEFS_H_ + +-#define uchar unsigned char +-#define uint16 unsigned short +-#define uint32 unsigned int +-#define uint64 unsigned long long ++#include <stdint.h> ++ ++typedef uint8_t uchar; ++typedef uint16_t uint16; ++typedef uint32_t uint32; ++typedef uint64_t uint64; + + typedef unsigned char uint8; + diff --git a/games-emulation/mupen64plus/files/mupen64plus-1.5-gcc46.patch b/games-emulation/mupen64plus/files/mupen64plus-1.5-gcc46.patch new file mode 100644 index 000000000000..2608fcd32a77 --- /dev/null +++ b/games-emulation/mupen64plus/files/mupen64plus-1.5-gcc46.patch @@ -0,0 +1,11 @@ +--- pre.mk.old 2011-04-14 20:39:21.000000000 +0200 ++++ pre.mk 2011-04-14 20:39:57.000000000 +0200 +@@ -319,7 +319,7 @@ + # tweak flags for 32-bit build on 64-bit system + ifeq ($(ARCH), 64BITS_32) + CFLAGS += -m32 +- LDFLAGS += -m32 -m elf_i386 ++ LDFLAGS += -m32 -Wl,-m,elf_i386 + endif + endif + ifeq ($(CPU_ENDIANNESS), BIG) diff --git a/games-emulation/mupen64plus/files/mupen64plus-1.5-libpng14.patch b/games-emulation/mupen64plus/files/mupen64plus-1.5-libpng14.patch new file mode 100644 index 000000000000..8d0b447fe96b --- /dev/null +++ b/games-emulation/mupen64plus/files/mupen64plus-1.5-libpng14.patch @@ -0,0 +1,34 @@ +http://bugs.gentoo.org/show_bug.cgi?id=308753 + +--- rice_video/liblinux/pngrw.c ++++ rice_video/liblinux/pngrw.c +@@ -136,9 +136,9 @@ + 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); ++ png_destroy_read_struct((png_structp *) &png_ptr, NULL, NULL); + if (rows) + { + if (rows[0]) +@@ -162,7 +162,7 @@ + + /* 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 ); + + /* create a pointer to the png read structure */ +@@ -199,7 +199,7 @@ + + /* 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, int_p_NULL, int_p_NULL); ++ &InterlaceType, (int *) NULL, (int *) NULL); + + img->width = Width; + img->height = Height; diff --git a/games-emulation/mupen64plus/files/mupen64plus-1.5-minizip.patch b/games-emulation/mupen64plus/files/mupen64plus-1.5-minizip.patch new file mode 100644 index 000000000000..9ed3d7a0b256 --- /dev/null +++ b/games-emulation/mupen64plus/files/mupen64plus-1.5-minizip.patch @@ -0,0 +1,35 @@ +use minizip from system zlib + +https://bugs.gentoo.org/383845 + +--- a/Makefile ++++ b/Makefile +@@ -101,8 +101,6 @@ + main/plugin.o \ + main/rom.o \ + main/savestates.o \ +- main/zip/ioapi.o \ +- main/zip/unzip.o \ + main/7zip/7zAlloc.o \ + main/7zip/7zBuffer.o \ + main/7zip/7zCrc.o \ +@@ -229,7 +227,7 @@ + # set primary objects and libraries for all outputs + ALL = mupen64plus $(PLUGINS) + OBJECTS = $(OBJ_CORE) $(OBJ_DYNAREC) $(OBJ_OPENGL) +-LIBS = $(SDL_LIBS) $(LIBGL_LIBS) $(LZMA_LIBS) -lbz2 ++LIBS = $(SDL_LIBS) $(LIBGL_LIBS) $(LZMA_LIBS) -lbz2 -lminizip + STATIC_LIBS = + CFLAGS+= $(LZMA_FLAGS) + +--- a/main/rom.c ++++ b/main/rom.c +@@ -27,7 +27,7 @@ + #include <limits.h> + #include <zlib.h> + +-#include "zip/unzip.h" ++#include "minizip/unzip.h" + #include <bzlib.h> + #include <lzma.h> + #include "7zip/7zExtract.h" |