Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
  • 6 commits
  • 7 files changed
  • 0 commit comments
  • 1 contributor
Commits on Nov 11, 2012
othyro Previous issues fixed. Almost there. Here's where we're at now:
dlopen('/usr/pkg/lib/mupen64plus/mupen64plus-audio-sdl.so') error: /usr/pkg/lib/mupen64plus/mupen64plus-audio-sdl.so: Undefined PLT symbol "SDL_MixAudio" (symnum = 6)
dlopen('/usr/pkg/lib/mupen64plus/mupen64plus-audio-sdl.so') error: /usr/pkg/lib/mupen64plus/mupen64plus-audio-sdl.so: Undefined PLT symbol "SDL_MixAudio" (symnum = 6)
UI-console: using Audio plugin: <dummy>
b5a00c7
othyro Fixes "array subscript has type 'char'" warning. ee6e0a4
othyro Fixes implicit declaration of fopen64, ftello64, and fseeko64 warnings. 730d3ae
othyro Remove zlib from pkg-config calls. Fixes warnings during build. Add -…
…lz to

LDLIBS.
7a4b1b6
othyro Regenerated due to adding/updating patches. 1375e78
othyro Removed BUILDLINK_TRANSFORM:rm=-ldl when OPSYS=Linux. Not necessary d…
…ue to

patches handling DL_LIBS.
9decffb
View
3  mupen64plus/Makefile
@@ -24,9 +24,6 @@ INSTALL_ENV+= MANDIR=${PREFIX}/${PKGMANDIR}
.include "options.mk"
-.if $(OPSYS) != "Linux"
-BUILDLINK_TRANSFORM= rm:-ldl
-.endif
do-build:
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${BASH} m64p_build.sh;
View
13 mupen64plus/TODO
@@ -1,11 +1,4 @@
-% mupen64plus
-[...]
-dlopen('./libmupen64plus.so.2') error: Cannot open "./libmupen64plus.so.2"
-AttachCoreLib() Error: failed to find Mupen64Plus Core library
+dlopen('/usr/pkg/lib/mupen64plus/mupen64plus-audio-sdl.so') error: /usr/pkg/lib/mupen64plus/mupen64plus-audio-sdl.so: Undefined PLT symbol "SDL_MixAudio" (symnum = 6)
+dlopen('/usr/pkg/lib/mupen64plus/mupen64plus-audio-sdl.so') error: /usr/pkg/lib/mupen64plus/mupen64plus-audio-sdl.so: Undefined PLT symbol "SDL_MixAudio" (symnum = 6)
+UI-console: using Audio plugin: <dummy>
-% cd /usr/pkg/lib; mupen64plus
-[...]
-dlopen('./libmupen64plus.so.2') error: ./libmupen64plus.so.2: Undefined PLT symbol "fseeko64" (symnum = 72)
-AttachCoreLib() Error: failed to find Mupen64Plus Core library
-
-but fseeko64 is defined in source/mupen64plus-core/src/main/zip/ioapi.h...
View
5 mupen64plus/distinfo
@@ -6,7 +6,10 @@ Size (mupen64plus-bundle-src-1.99.5.tar.gz) = 1732468 bytes
SHA1 (patch-m64p__build.sh) = 0a154241aa2e4cb8be922f642d6112b35f027f2a
SHA1 (patch-source_mupen64plus-audio-sdl_projects_unix_Makefile) = 53f84a0fdd4d6546345b73b75094ec27beac1206
SHA1 (patch-source_mupen64plus-audio-sdl_src_main.c) = d12d692398138e2ac2afb22ad462bea1201e364c
-SHA1 (patch-source_mupen64plus-core_projects_unix_Makefile) = 10129a5d9b5a721113ceab810db1c9f44ce8e129
+SHA1 (patch-source_mupen64plus-core_projects_unix_Makefile) = a27707415ec2398af73eb91d1012a50aa7c7656d
+SHA1 (patch-source_mupen64plus-core_src_main_util.c) = a19e07be7fe63bf1cf8c2b954580144c0cbad688
+SHA1 (patch-source_mupen64plus-core_src_main_zip_ioapi.h) = 816dc62d72ce542a5e1c151762e32d3c90ef6686
+SHA1 (patch-source_mupen64plus-core_src_osd_screenshot.cpp) = f9baa01f25fc2c8b21ec3058de2d4f51cb0c8db2
SHA1 (patch-source_mupen64plus-input-sdl_projects_unix_Makefile) = 0e3d5edcf0529b5815c7d84fcdbeab2f540601e9
SHA1 (patch-source_mupen64plus-rsp-hle_projects_unix_Makefile) = 286318c16f10ff10feccab08732cd20de537e85b
SHA1 (patch-source_mupen64plus-ui-console_projects_unix_Makefile) = c5c3d93a399f5cb312efc684a1bb0f01049dde42
View
13 mupen64plus/patches/patch-source_mupen64plus-core_projects_unix_Makefile
@@ -53,7 +53,7 @@ Adding NetBSD support. Setting TARGET, CFLAGS, LDFLAGS, LIBS, etc.
+ SONAME = libmupen64plus.so.2
+ CFLAGS += -I${PREFIX}/include -I../../src/
+ LDFLAGS += -Wl,-rpath,${LIBDIR} -shared -Wl,-export-dynamic -Wl,-soname,$(SONAME)
-+ LIBS += $(shell pkg-config --libs gl glu libpng freetype2) -lz -lm
++ LIBS += $(shell pkg-config --libs freetype2 gl glu libpng) -lz -lm
+endif
ifeq ($(CPU_ENDIANNESS), BIG)
CFLAGS += -DM64P_BIG_ENDIAN
@@ -68,6 +68,17 @@ Adding NetBSD support. Setting TARGET, CFLAGS, LDFLAGS, LIBS, etc.
ifeq ($(shell pkg-config --modversion freetype2 2>/dev/null),)
$(error No FreeType 2 development libraries found!)
endif
+@@ -183,8 +190,8 @@ endif
+ ifeq ($(shell pkg-config --modversion glu 2>/dev/null),)
+ $(error No OpenGL utility development libraries found!)
+ endif
+-CFLAGS += $(shell pkg-config --cflags libpng zlib freetype2 gl glu)
+-LDLIBS += $(shell pkg-config --libs libpng zlib freetype2 gl glu)
++CFLAGS += $(shell pkg-config --cflags libpng freetype2 gl glu)
++LDLIBS += $(shell pkg-config --libs libpng freetype2 gl glu) -lz
+
+ # test for presence of SDL
+ ifeq ($(shell which sdl-config 2>/dev/null),)
@@ -212,6 +219,9 @@ else
ifeq ($(OS),FREEBSD)
LDCONFIG ?= PATH="$$PATH:/sbin" ldconfig -m
View
24 mupen64plus/patches/patch-source_mupen64plus-core_src_main_util.c
@@ -0,0 +1,24 @@
+$NetBSD$
+
+Fixes "array subscript has type 'char'" warning.
+
+--- source/mupen64plus-core/src/main/util.c.orig 2012-03-10 18:31:29.000000000 +0000
++++ source/mupen64plus-core/src/main/util.c
+@@ -45,7 +45,7 @@ char *trim(char *str)
+ unsigned int i;
+ char *p = str;
+
+- while (isspace(*p))
++ while (isspace((unsigned char)*p))
+ p++;
+
+ if (str != p)
+@@ -57,7 +57,7 @@ char *trim(char *str)
+ p = str + strlen(str) - 1;
+ if (p > str)
+ {
+- while (isspace(*p))
++ while (isspace((unsigned char)*p))
+ p--;
+ p[1] = '\0';
+ }
View
17 mupen64plus/patches/patch-source_mupen64plus-core_src_main_zip_ioapi.h
@@ -0,0 +1,17 @@
+$NetBSD$
+
+Fixes implicit declaration of fopen64, ftello64, and fseeko64 warnings.
+
+--- source/mupen64plus-core/src/main/zip/ioapi.h.orig 2012-03-10 18:31:29.000000000 +0000
++++ source/mupen64plus-core/src/main/zip/ioapi.h
+@@ -58,6 +58,10 @@
+ #define ftello64 ftell
+ #define fseeko64 fseek
+ #endif
++#else
++ #define fopen64 fopen
++ #define ftello64 ftello
++ #define fseeko64 fseeko
+ #endif
+ #endif
+
View
15 mupen64plus/patches/patch-source_mupen64plus-core_src_osd_screenshot.cpp
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Fixes "array subscript has type 'char'" warning.
+
+--- source/mupen64plus-core/src/osd/screenshot.cpp.orig 2012-03-10 18:31:29.000000000 +0000
++++ source/mupen64plus-core/src/osd/screenshot.cpp
+@@ -173,7 +173,7 @@ static void GetBaseFilepath(char *filepa
+ if (ch == ' ')
+ *pch++ = '_';
+ else
+- *pch++ = tolower(ch);
++ *pch++ = tolower((unsigned char)ch);
+ } while (ch != 0);
+
+ return;

No commit comments for this range

Something went wrong with that request. Please try again.