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.
...
  • 7 commits
  • 7 files changed
  • 0 commit comments
  • 2 contributors
View
5 mupen64plus/TODO
@@ -1,4 +1 @@
-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>
-
+Test gamepads.
View
2  mupen64plus/distinfo
@@ -4,7 +4,7 @@ SHA1 (mupen64plus-bundle-src-1.99.5.tar.gz) = ca80ae446c9591e272e3ec93f0a2a8b01c
RMD160 (mupen64plus-bundle-src-1.99.5.tar.gz) = 9e5aec09f73e70e9010d18d67756e3204e580307
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_projects_unix_Makefile) = 46f37f4a228bb4555fe849096d031ca71f87e49d
SHA1 (patch-source_mupen64plus-audio-sdl_src_main.c) = d12d692398138e2ac2afb22ad462bea1201e364c
SHA1 (patch-source_mupen64plus-core_projects_unix_Makefile) = a27707415ec2398af73eb91d1012a50aa7c7656d
SHA1 (patch-source_mupen64plus-core_src_main_util.c) = a19e07be7fe63bf1cf8c2b954580144c0cbad688
View
2  mupen64plus/patches/patch-source_mupen64plus-audio-sdl_projects_unix_Makefile
@@ -30,7 +30,7 @@ Adding NetBSD support. Setting OS, SO_NAME, CFLAGS, LDFLAGS, LIBS, etc.
CFLAGS += $(shell sdl-config --cflags)
LDLIBS += $(shell sdl-config --libs)
endif
-+ifeq ($OS),NETBSD)
++ifeq ($(OS),NETBSD)
+ CFLAGS += $(shell sdl-config --cflags)
+ LDLIBS += -Wl,-rpath,${LIBDIR} $(shell sdl-config --libs)
+endif
View
16 rsound/buildlink3.mk
@@ -8,35 +8,35 @@ RSOUND_BUILDLINK3_MK:=
pkgbase := rsound
.include "../../mk/pkg-build-options.mk"
-.if !empty(PKG_BUILD_OPTIONS:Malsa)
+.if !empty(PKG_BUILD_OPTIONS.rsound:Malsa)
.include "../../audio/alsa-lib/buildlink3.mk"
.endif
-.if !empty(PKG_BUILD_OPTIONS:Mjack)
+.if !empty(PKG_BUILD_OPTIONS.rsound:Mjack)
.include "../../audio/jack/buildlink3.mk"
.endif
-.if !empty(PKG_BUILD_OPTIONS:Mlibao)
+.if !empty(PKG_BUILD_OPTIONS.rsound:Mlibao)
.include "../../audio/libao/buildlink3.mk"
.endif
-.if !empty(PKG_BUILD_OPTIONS:Msamplerate)
+.if !empty(PKG_BUILD_OPTIONS.rsound:Msamplerate)
.include "../../audio/libsamplerate/buildlink3.mk"
.endif
-.if !empty(PKG_BUILD_OPTIONS:Mopenal)
+.if !empty(PKG_BUILD_OPTIONS.rsound:Mopenal)
.include "../../audio/openal/buildlink3.mk"
.endif
-.if !empty(PKG_BUILD_OPTIONS:Moss)
+.if !empty(PKG_BUILD_OPTIONS.rsound:Moss)
.include "../../mk/oss.buildlink3.mk"
.endif
-.if !empty(PKG_BUILD_OPTIONS:Mportaudio)
+.if !empty(PKG_BUILD_OPTIONS.rsound:Mportaudio)
.include "../../audio/portaudio/buildlink3.mk"
.endif
-.if !empty(PKG_BUILD_OPTIONS:Mpulseaudio)
+.if !empty(PKG_BUILD_OPTIONS.rsound:Mpulseaudio)
.include "../../audio/pulseaudio/buildlink3.mk"
.endif
View
3  twinkle/Makefile
@@ -2,7 +2,7 @@
#
DISTNAME= twinkle-1.4.2
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= audio chat net
MASTER_SITES= http://www.xs4all.nl/~mfnboer/twinkle/download/
@@ -30,6 +30,7 @@ SUBST_SED.boost+= -e 's,boost_regex-gcc,boost_regex-mt,'
LDFLAGS+= ${BUILDLINK_LDADD.oss}
+
.include "../../security/libgcrypt/buildlink3.mk"
.include "../../mk/oss.buildlink3.mk"
.include "../../audio/libsndfile/buildlink3.mk"
View
4 twinkle/buildlink3.mk
@@ -12,6 +12,10 @@ BUILDLINK_PKGSRCDIR.twinkle?= ../../wip/twinkle
pkgbase := twinkle
.include "../../mk/pkg-build-options.mk"
+.if !empty(PKG_BUILD_OPTIONS:Malsa)
+.include "../../audio/alsa-lib/buildlink3.mk"
+.endif
+
.if !empty(PKG_BUILD_OPTIONS:Milbc)
.include "../../wip/ilbc-rfc3951/buildlink3.mk"
.endif
View
10 twinkle/options.mk
@@ -1,11 +1,17 @@
# $NetBSD$
PKG_OPTIONS_VAR= PKG_OPTIONS.twinkle
-PKG_SUPPORTED_OPTIONS= ilbc kde speex zrtp
-PKG_SUGGESTED_OPTIONS= kde speex
+PKG_SUPPORTED_OPTIONS= alsa ilbc kde speex zrtp
+PKG_SUGGESTED_OPTIONS= ilbc speex zrtp
.include "../../mk/bsd.options.mk"
+.if !empty(PKG_OPTIONS:Malsa)
+.include "../../audio/alsa-lib/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --without-alsa
+.endif
+
.if !empty(PKG_OPTIONS:Milbc)
.include "../../wip/ilbc-rfc3951/buildlink3.mk"
.else

No commit comments for this range

Something went wrong with that request. Please try again.