aboutsummaryrefslogtreecommitdiff
path: root/devel/sdl12
diff options
context:
space:
mode:
authorStanislav Sedov <stas@FreeBSD.org>2006-09-20 11:21:59 +0000
committerStanislav Sedov <stas@FreeBSD.org>2006-09-20 11:21:59 +0000
commit0d2725682b8325a08b11592d11062997bb9dc7f2 (patch)
tree46ab0c86563bfc2fbab1ecc5f9dadffb47afe737 /devel/sdl12
parent750f1f56ed3264341b911b1182fc2f3f4dd609c2 (diff)
downloadports-0d2725682b8325a08b11592d11062997bb9dc7f2.tar.gz
ports-0d2725682b8325a08b11592d11062997bb9dc7f2.zip
Notes
Diffstat (limited to 'devel/sdl12')
-rw-r--r--devel/sdl12/Makefile63
-rw-r--r--devel/sdl12/distinfo6
-rw-r--r--devel/sdl12/files/patch-Makefile.in11
-rw-r--r--devel/sdl12/files/patch-ac39
-rw-r--r--devel/sdl12/files/patch-ag26
-rw-r--r--devel/sdl12/files/patch-ah26
-rw-r--r--devel/sdl12/files/patch-ai11
-rw-r--r--devel/sdl12/files/patch-aj60
-rw-r--r--devel/sdl12/files/patch-ak23
-rw-r--r--devel/sdl12/files/patch-configure13
-rw-r--r--devel/sdl12/files/patch-sdl-config.in15
-rw-r--r--devel/sdl12/files/patch-sdl.pc.in12
-rw-r--r--devel/sdl12/files/patch-src_hermes_HeadMMX.h39
-rw-r--r--devel/sdl12/files/patch-src_hermes_HeadX86.h96
-rw-r--r--devel/sdl12/files/patch-src_joystick_bsd_SDL__sysjoystick.c14
-rw-r--r--devel/sdl12/files/patch-src_video_SDL__yuv__mmx.c324
-rw-r--r--devel/sdl12/pkg-plist386
17 files changed, 391 insertions, 773 deletions
diff --git a/devel/sdl12/Makefile b/devel/sdl12/Makefile
index cdf4f44f21c3..025f725ec74b 100644
--- a/devel/sdl12/Makefile
+++ b/devel/sdl12/Makefile
@@ -6,8 +6,8 @@
#
PORTNAME= sdl
-PORTVERSION= 1.2.9
-PORTREVISION= 2
+PORTVERSION= 1.2.11
+PORTREVISION= 0
PORTEPOCH= 2
CATEGORIES= devel
MASTER_SITES= http://www.libsdl.org/release/
@@ -21,11 +21,12 @@ BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
WANT_GNOME= yes
+USE_GNOME= gnomehack gnometarget
+USE_ICONV= yes
CONFIGURE_ENV= NASM="${LOCALBASE}/bin/nasm" \
PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}" \
LDFLAGS="${LDFLAGS}"
-CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
@@ -37,13 +38,20 @@ PKGNAMESUFFIX= -nox11
CONFIGURE_ARGS+=--disable-video-x11
.endif
-.if !defined(NOPORTDOCS)
-PORTDOCS= *
-.endif
+# XXX: exists untill it will be committed to bsd.port.mk
+COPYTREE_SHARE= ${SH} -c '(${FIND} -d $$0 $$2 | ${CPIO} -dumpl $$1 >/dev/null \
+ 2>&1) && \
+ ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} $$1 && \
+ ${FIND} $$1/ -type d -exec ${CHMOD} 755 {} \; && \
+ ${FIND} $$1/ -type f -exec ${CHMOD} ${SHAREMODE} {} \;' --
+
+EXAMPLES= test/*.c test/*.bmp test/*.dat test/*.xbm test/*.wav
+DOCS= BUGS COPYING CREDITS README README-SDL.txt WhatsNew docs.html
OPTIONS= NAS "Include support for the Network Audio System" Off \
+ AALIB "Include support for AA-lib" On \
GL "Include support for OpenGL" On \
- AALIB "Include support for AA-lib" On
+ GGI "Include support for GGI" Off
.include <bsd.port.pre.mk>
@@ -62,24 +70,26 @@ LIB_DEPENDS+= audio.2:${PORTSDIR}/audio/nas
CONFIGURE_ARGS+=--disable-nas
.endif
+.if defined(WITH_GGI)
+LIB_DEPENDS+= ggi.2:${PORTSDIR}/graphics/libggi
+CONFIGURE_ARGS+=--enable-video-ggi
+.else
+CONFIGURE_ARGS+=--disable-video-ggi
+.endif
+
.if defined(WITHOUT_GL)
CONFIGURE_ARGS+=--disable-video-opengl
.else
USE_GL= yes
CONFIGURE_ARGS+=--enable-video-opengl
.endif
+
.if defined(WITHOUT_AALIB)
CONFIGURE_ARGS+=--disable-video-aalib
.else
LIB_DEPENDS+= aa.1:${PORTSDIR}/graphics/aalib
CONFIGURE_ARGS+=--enable-video-aalib
.endif
-.if exists(/usr/include/libusbhid.h)
-CONFIGURE_ENV+= USB_LIBS=-lusbhid
-CFLAGS+= -DHAVE_LIBUSBHID_H
-.else
-CONFIGURE_ENV+= USB_LIBS=-lusb
-.endif
MAN3!= ${CAT} ${FILESDIR}/man3
@@ -105,34 +115,19 @@ CONFIGURE_ARGS+=--enable-arts
CONFIGURE_ARGS+=--disable-arts
.endif
-post-patch:
- @${REINPLACE_CMD} 's|sdl-config|sdl11-config|g' \
- ${WRKSRC}/test/configure
- @${RM} ${WRKSRC}/test/configure.bak
-
pre-configure:
@${FIND} ${WRKSRC} -type f -name Makefile.in | ${XARGS} ${TOUCH}
-post-configure:
- @cd ${WRKSRC} && \
- ${CP} sdl-config sdl11-config && \
- ${CP} sdl.m4 sdl11.m4
- @${REINPLACE_CMD} 's|^deplibs_check_method=.*|deplibs_check_method=pass_all|' \
- ${WRKSRC}/libtool
-
post-install:
+.if !defined(NOPORTDOCS)
@${MKDIR} ${EXAMPLESDIR}
- ${INSTALL_DATA} ${WRKSRC}/test/* ${EXAMPLESDIR}
- @${INSTALL_SCRIPT} ${WRKSRC}/test/configure ${EXAMPLESDIR}
+ @${MKDIR} ${DOCSDIR}
+ ${INSTALL_DATA} ${EXAMPLES:S,^,${WRKSRC}/,} ${EXAMPLESDIR}/
@${ECHO_MSG} "===> Examples installed in ${EXAMPLESDIR}."
-.if !defined(NOPORTDOCS)
- @${MKDIR} ${DOCSDIR}/docs
-.for f in BUGS COPYING CREDITS README README-SDL.txt WhatsNew docs.html
- ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
-.endfor
+ ${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/
@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
- @cd ${WRKSRC}/docs; ${TAR} cf - `${ECHO_CMD} [^Mm]*` | \
- (cd ${DOCSDIR}/docs; ${TAR} --unlink -xf - )
+ @(cd ${WRKSRC} && \
+ ${COPYTREE_SHARE} docs ${DOCSDIR}/ "! -regex .*/man3.*")
.endif
@${DISPLAY_MSG}
diff --git a/devel/sdl12/distinfo b/devel/sdl12/distinfo
index c0b9ecd964e9..79b0ccd66e40 100644
--- a/devel/sdl12/distinfo
+++ b/devel/sdl12/distinfo
@@ -1,3 +1,3 @@
-MD5 (SDL-1.2.9.tar.gz) = 80919ef556425ff82a8555ff40a579a0
-SHA256 (SDL-1.2.9.tar.gz) = d5a168968051536641ab5a3ba5fc234383511c77a8bc5ceb8bed619bdd42e5f9
-SIZE (SDL-1.2.9.tar.gz) = 2688179
+MD5 (SDL-1.2.11.tar.gz) = 418b42956b7cd103bfab1b9077ccc149
+SHA256 (SDL-1.2.11.tar.gz) = 6985823287b224b57390b1c1b6cbc54cc9a7d7757fbf9934ed20754b4cd23730
+SIZE (SDL-1.2.11.tar.gz) = 2796407
diff --git a/devel/sdl12/files/patch-Makefile.in b/devel/sdl12/files/patch-Makefile.in
new file mode 100644
index 000000000000..aa132d337790
--- /dev/null
+++ b/devel/sdl12/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig Wed Jul 5 00:58:18 2006
++++ Makefile.in Wed Jul 5 01:06:48 2006
+@@ -44,7 +44,7 @@
+ LT_CURRENT = @LT_CURRENT@
+ LT_RELEASE = @LT_RELEASE@
+ LT_REVISION = @LT_REVISION@
+-LT_LDFLAGS = -no-undefined -rpath $(libdir) -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
++LT_LDFLAGS = -no-undefined -rpath $(libdir) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+
+ all: $(srcdir)/configure Makefile $(objects) $(objects)/$(TARGET) $(objects)/$(SDLMAIN_TARGET)
+
diff --git a/devel/sdl12/files/patch-ac b/devel/sdl12/files/patch-ac
deleted file mode 100644
index 79afca277d61..000000000000
--- a/devel/sdl12/files/patch-ac
+++ /dev/null
@@ -1,39 +0,0 @@
---- configure.orig Mon Feb 23 06:32:33 2004
-+++ configure Wed Mar 17 19:23:24 2004
-@@ -21171,7 +21171,7 @@
-
-
- SDL_CFLAGS=""
--SDL_LIBS="-lSDL"
-+SDL_LIBS="-lSDL-1.1"
-
-
- case "$target" in
-@@ -25926,8 +25926,8 @@
- # pthread_cflags="-D_REENTRANT -D_THREAD_SAFE"
- ;;
- *-*-freebsd*)
-- pthread_cflags="-D_REENTRANT -D_THREAD_SAFE"
-- pthread_lib="-pthread"
-+ pthread_cflags="-D_REENTRANT ${PTHREAD_CFLAGS}"
-+ pthread_lib="${PTHREAD_LIBS}"
- ;;
- *-*-netbsd*)
- pthread_cflags="-I/usr/pkg/include -D_REENTRANT"
-@@ -28394,14 +28394,13 @@
- fi
-
-
-- if test x$have_usb_h = xyes; then
-- CFLAGS="$CFLAGS -DHAVE_USB_H"
-- fi
- if test x$have_usbhid_h = xyes; then
- CFLAGS="$CFLAGS -DHAVE_USBHID_H"
- fi
- if test x$have_libusb_h = xyes; then
-+ if test x$have_libusbhid_h = xno; then
- CFLAGS="$CFLAGS -DHAVE_LIBUSB_H"
-+ fi
- fi
- if test x$have_libusbhid_h = xyes; then
- CFLAGS="$CFLAGS -DHAVE_LIBUSBHID_H"
diff --git a/devel/sdl12/files/patch-ag b/devel/sdl12/files/patch-ag
deleted file mode 100644
index ac69a60f0726..000000000000
--- a/devel/sdl12/files/patch-ag
+++ /dev/null
@@ -1,26 +0,0 @@
---- src/Makefile.in.orig Mon Feb 23 08:32:05 2004
-+++ src/Makefile.in Mon Mar 8 18:41:14 2004
-@@ -296,12 +296,12 @@
- DIST_SUBDIRS = $(CORE_SUBDIRS) $(EXTRA_SUBDIRS)
-
- # The SDL library target
--lib_LTLIBRARIES = libSDL.la
-+lib_LTLIBRARIES = libSDL-1.1.la
- libSDL_la_SOURCES = $(GENERAL_SRCS)
- libSDL_la_LDFLAGS = \
- -no-undefined \
-- -release $(LT_RELEASE) \
- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-+# -release $(LT_RELEASE) \
-
- libSDL_la_LIBADD = \
- main/libarch.la \
-@@ -383,7 +383,7 @@
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
--libSDL.la: $(libSDL_la_OBJECTS) $(libSDL_la_DEPENDENCIES)
-+libSDL-1.1.la: $(libSDL_la_OBJECTS) $(libSDL_la_DEPENDENCIES)
- $(LINK) -rpath $(libdir) $(libSDL_la_LDFLAGS) $(libSDL_la_OBJECTS) $(libSDL_la_LIBADD) $(LIBS)
-
- mostlyclean-compile:
diff --git a/devel/sdl12/files/patch-ah b/devel/sdl12/files/patch-ah
deleted file mode 100644
index 93855790593f..000000000000
--- a/devel/sdl12/files/patch-ah
+++ /dev/null
@@ -1,26 +0,0 @@
---- src/main/Makefile.in.orig Mon Feb 23 08:32:20 2004
-+++ src/main/Makefile.in Mon Mar 8 15:59:18 2004
-@@ -319,7 +319,7 @@
-
-
- # Build a separate library containing the main() entry point.
--lib_LIBRARIES = libSDLmain.a
-+lib_LIBRARIES = libSDLmain-1.1.a
- @TARGET_MACOSX_FALSE@@TARGET_QTOPIA_FALSE@@TARGET_WIN32_FALSE@MAINLIB_ARCH_SRCS = dummy/SDL_dummy_main.c
- @TARGET_MACOSX_FALSE@@TARGET_QTOPIA_TRUE@@TARGET_WIN32_FALSE@MAINLIB_ARCH_SRCS = qtopia/SDL_qtopia_main.cc
- @TARGET_MACOSX_TRUE@@TARGET_WIN32_FALSE@MAINLIB_ARCH_SRCS = macosx/SDLMain.m macosx/SDLMain.h
-@@ -393,10 +393,10 @@
-
- clean-libLIBRARIES:
- -test -z "$(lib_LIBRARIES)" || rm -f $(lib_LIBRARIES)
--libSDLmain.a: $(libSDLmain_a_OBJECTS) $(libSDLmain_a_DEPENDENCIES)
-- -rm -f libSDLmain.a
-- $(libSDLmain_a_AR) libSDLmain.a $(libSDLmain_a_OBJECTS) $(libSDLmain_a_LIBADD)
-- $(RANLIB) libSDLmain.a
-+libSDLmain-1.1.a: $(libSDLmain_a_OBJECTS) $(libSDLmain_a_DEPENDENCIES)
-+ -rm -f libSDLmain-1.1.a
-+ $(libSDLmain_a_AR) libSDLmain-1.1.a $(libSDLmain_a_OBJECTS) $(libSDLmain_a_LIBADD)
-+ $(RANLIB) libSDLmain-1.1.a
-
- clean-noinstLTLIBRARIES:
- -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
diff --git a/devel/sdl12/files/patch-ai b/devel/sdl12/files/patch-ai
deleted file mode 100644
index 797e6bc54295..000000000000
--- a/devel/sdl12/files/patch-ai
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/Makefile.in.orig Mon Feb 23 08:32:04 2004
-+++ include/Makefile.in Mon Mar 8 16:00:11 2004
-@@ -256,7 +256,7 @@
- target_vendor = @target_vendor@
-
- # The directory where the include files will be installed
--libSDLincludedir = $(includedir)/SDL
-+libSDLincludedir = $(includedir)/SDL11
-
- # Which header files to install
- libSDLinclude_HEADERS = \
diff --git a/devel/sdl12/files/patch-aj b/devel/sdl12/files/patch-aj
deleted file mode 100644
index 057d3a9e88cd..000000000000
--- a/devel/sdl12/files/patch-aj
+++ /dev/null
@@ -1,60 +0,0 @@
---- Makefile.in.orig Mon Feb 23 08:32:04 2004
-+++ Makefile.in Mon Mar 8 16:01:47 2004
-@@ -81,7 +81,7 @@
- GZIP_ENV = --best
- distuninstallcheck_listfiles = find . -type f -print
- distcleancheck_listfiles = find . -type f -print
--ACLOCAL = @ACLOCAL@
-+ACLOCAL = #@ACLOCAL@
- ALLOCA = @ALLOCA@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -93,9 +93,9 @@
- ASFLAGS = @ASFLAGS@
- AUDIO_DRIVERS = @AUDIO_DRIVERS@
- AUDIO_SUBDIRS = @AUDIO_SUBDIRS@
--AUTOCONF = @AUTOCONF@
--AUTOHEADER = @AUTOHEADER@
--AUTOMAKE = @AUTOMAKE@
-+AUTOCONF = #@AUTOCONF@
-+AUTOHEADER = #@AUTOHEADER@
-+AUTOMAKE = #@AUTOMAKE@
- AWK = @AWK@
- CC = @CC@
- CCAS = @CCAS@
-@@ -285,7 +285,7 @@
- DIST_SUBDIRS = $(SUBDIRS)
-
- # SDL runtime configuration script
--bin_SCRIPTS = sdl-config
-+bin_SCRIPTS = sdl11-config
-
- # All the rest of the distributed files
- EXTRA_DIST = \
-@@ -321,7 +321,7 @@
- EpocBuildFiles.zip \
- WhatsNew \
- docs.html \
-- sdl.m4 \
-+ sdl11.m4 \
- SDL.spec \
- autogen.sh \
- strip_fPIC.sh
-@@ -329,7 +329,7 @@
-
- # M4 macro file for inclusion with autoconf
- m4datadir = $(datadir)/aclocal
--m4data_DATA = sdl.m4
-+m4data_DATA = sdl11.m4
-
- # Create a CVS snapshot that people can run update -d on
- CVSROOT = :pserver:guest@libsdl.org:/home/sdlweb/libsdl.org/cvs
-@@ -369,7 +369,7 @@
- cd $(srcdir) && $(AUTOCONF)
- $(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
--sdl-config: $(top_builddir)/config.status $(srcdir)/sdl-config.in
-+sdl11-config: $(top_builddir)/config.status $(srcdir)/sdl-config.in
- cd $(top_builddir) && $(SHELL) ./config.status $@
- SDL.spec: $(top_builddir)/config.status $(srcdir)/SDL.spec.in
- cd $(top_builddir) && $(SHELL) ./config.status $@
diff --git a/devel/sdl12/files/patch-ak b/devel/sdl12/files/patch-ak
deleted file mode 100644
index 36e1616c3f76..000000000000
--- a/devel/sdl12/files/patch-ak
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD$
-
---- sdl-config.in.orig Mon Sep 9 08:28:06 2002
-+++ sdl-config.in Fri Jan 3 10:43:28 2003
-@@ -5,7 +5,7 @@
- exec_prefix_set=no
-
- usage="\
--Usage: sdl-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs] [--static-libs]"
-+Usage: sdl11-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs] [--static-libs]"
-
- if test $# -eq 0; then
- echo "${usage}" 1>&2
-@@ -39,7 +39,7 @@
- echo @SDL_VERSION@
- ;;
- --cflags)
-- echo -I@includedir@/SDL @SDL_CFLAGS@
-+ echo -I@includedir@/SDL11 -I@includedir@ @SDL_CFLAGS@
-
- # The portable way of including SDL is #include "SDL.h"
- #if test @includedir@ != /usr/include ; then
diff --git a/devel/sdl12/files/patch-configure b/devel/sdl12/files/patch-configure
new file mode 100644
index 000000000000..6a5419d3f9cf
--- /dev/null
+++ b/devel/sdl12/files/patch-configure
@@ -0,0 +1,13 @@
+--- configure.orig Wed Jul 5 00:52:15 2006
++++ configure Wed Jul 5 01:01:28 2006
+@@ -29772,8 +29772,8 @@
+ # pthread_cflags="-D_REENTRANT -D_THREAD_SAFE"
+ ;;
+ *-*-freebsd*|*-*-dragonfly*)
+- pthread_cflags="-D_REENTRANT -D_THREAD_SAFE"
+- pthread_lib="-pthread"
++ pthread_cflags="-D_REENTRANT ${PTHREAD_CFLAGS}"
++ pthread_lib="${PTHREAD_LIBS}"
+ ;;
+ *-*-netbsd*)
+ pthread_cflags="-D_REENTRANT -D_THREAD_SAFE"
diff --git a/devel/sdl12/files/patch-sdl-config.in b/devel/sdl12/files/patch-sdl-config.in
new file mode 100644
index 000000000000..d12cba743f80
--- /dev/null
+++ b/devel/sdl12/files/patch-sdl-config.in
@@ -0,0 +1,15 @@
+#
+# Temporary hack to provide iconv include directory is well
+# (sdl explicitly includes iconv.h)
+#
+--- sdl-config.in.orig Thu Aug 31 03:54:26 2006
++++ sdl-config.in Thu Aug 31 03:54:39 2006
+@@ -41,7 +41,7 @@
+ echo @SDL_VERSION@
+ ;;
+ --cflags)
+- echo -I@includedir@/SDL @SDL_CFLAGS@
++ echo -I@includedir@/SDL -I@includedir@ @SDL_CFLAGS@
+ ;;
+ @ENABLE_SHARED_TRUE@ --libs)
+ @ENABLE_SHARED_TRUE@ echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@
diff --git a/devel/sdl12/files/patch-sdl.pc.in b/devel/sdl12/files/patch-sdl.pc.in
new file mode 100644
index 000000000000..2ba3a62f80e9
--- /dev/null
+++ b/devel/sdl12/files/patch-sdl.pc.in
@@ -0,0 +1,12 @@
+#
+# Temporary hack to provide iconv include directory is well
+# (sdl explicitly includes iconv.h)
+#
+--- sdl.pc.in.orig Thu Aug 31 03:47:07 2006
++++ sdl.pc.in Thu Aug 31 03:47:19 2006
+@@ -11,4 +11,4 @@
+ Requires:
+ Conflicts:
+ Libs: -L${libdir} @SDL_RLD_FLAGS@ @SDL_LIBS@
+-Cflags: -I${includedir}/SDL @SDL_CFLAGS@
++Cflags: -I${includedir}/SDL -I${includedir} @SDL_CFLAGS@
diff --git a/devel/sdl12/files/patch-src_hermes_HeadMMX.h b/devel/sdl12/files/patch-src_hermes_HeadMMX.h
deleted file mode 100644
index d525149cc39f..000000000000
--- a/devel/sdl12/files/patch-src_hermes_HeadMMX.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-$FreeBSD$
-
---- src/hermes/HeadMMX.h.orig
-+++ src/hermes/HeadMMX.h
-@@ -50,21 +50,19 @@
- extern "C" {
- #endif
-
-- void ConvertMMX(HermesConverterInterface *) __attribute__ ((alias ("_ConvertMMX")));
--#if 0
-- void ClearMMX_32(HermesClearInterface *) __attribute__ ((alias ("_ClearMMX_32")));
-- void ClearMMX_24(HermesClearInterface *) __attribute__ ((alias ("_ClearMMX_24")));
-- void ClearMMX_16(HermesClearInterface *) __attribute__ ((alias ("_ClearMMX_16")));
-- void ClearMMX_8(HermesClearInterface *) __attribute__ ((alias ("_ClearMMX_8")));
--
-- void ConvertMMXp32_16RGB555() __attribute__ ((alias ("_ConvertMMXp32_16RGB555")));
--#endif
-+ extern void _ConvertMMX(HermesConverterInterface *);
-+ extern void _ConvertMMXpII32_24RGB888();
-+ extern void _ConvertMMXpII32_16RGB565();
-+ extern void _ConvertMMXpII32_16BGR565();
-+ extern void _ConvertMMXpII32_16RGB555();
-+ extern void _ConvertMMXpII32_16BGR555();
-
-- void ConvertMMXpII32_24RGB888() __attribute__ ((alias ("_ConvertMMXpII32_24RGB888")));
-- void ConvertMMXpII32_16RGB565() __attribute__ ((alias ("_ConvertMMXpII32_16RGB565")));
-- void ConvertMMXpII32_16BGR565() __attribute__ ((alias ("_ConvertMMXpII32_16BGR565")));
-- void ConvertMMXpII32_16RGB555() __attribute__ ((alias ("_ConvertMMXpII32_16RGB555")));
-- void ConvertMMXpII32_16BGR555() __attribute__ ((alias ("_ConvertMMXpII32_16BGR555")));
-+ #define ConvertMMX _ConvertMMX
-+ #define ConvertMMXpII32_24RGB888 _ConvertMMXpII32_24RGB888
-+ #define ConvertMMXpII32_16RGB565 _ConvertMMXpII32_16RGB565
-+ #define ConvertMMXpII32_16BGR565 _ConvertMMXpII32_16BGR565
-+ #define ConvertMMXpII32_16RGB555 _ConvertMMXpII32_16RGB555
-+ #define ConvertMMXpII32_16BGR555 _ConvertMMXpII32_16BGR555
-
- #ifdef __cplusplus
- }
diff --git a/devel/sdl12/files/patch-src_hermes_HeadX86.h b/devel/sdl12/files/patch-src_hermes_HeadX86.h
deleted file mode 100644
index 32bb694ac66f..000000000000
--- a/devel/sdl12/files/patch-src_hermes_HeadX86.h
+++ /dev/null
@@ -1,96 +0,0 @@
-
-$FreeBSD$
-
---- src/hermes/HeadX86.h.orig
-+++ src/hermes/HeadX86.h
-@@ -79,56 +79,47 @@
- extern "C" {
- #endif
-
-- int Hermes_X86_CPU() __attribute__ ((alias ("_Hermes_X86_CPU")));
-+ extern int _Hermes_X86_CPU();
-
-- void ConvertX86(HermesConverterInterface *) __attribute__ ((alias ("_ConvertX86")));
-+ extern void _ConvertX86(HermesConverterInterface *);
-
--#if 0
-- void ClearX86_32(HermesClearInterface *) __attribute__ ((alias ("_ClearX86_32")));
-- void ClearX86_24(HermesClearInterface *) __attribute__ ((alias ("_ClearX86_24")));
-- void ClearX86_16(HermesClearInterface *) __attribute__ ((alias ("_ClearX86_16")));
-- void ClearX86_8(HermesClearInterface *) __attribute__ ((alias ("_ClearX86_8")));
--#endif
-+ extern void _ConvertX86p32_32BGR888();
-+ extern void _ConvertX86p32_32RGBA888();
-+ extern void _ConvertX86p32_32BGRA888();
-+ extern void _ConvertX86p32_24RGB888();
-+ extern void _ConvertX86p32_24BGR888();
-+ extern void _ConvertX86p32_16RGB565();
-+ extern void _ConvertX86p32_16BGR565();
-+ extern void _ConvertX86p32_16RGB555();
-+ extern void _ConvertX86p32_16BGR555();
-+ extern void _ConvertX86p32_8RGB332();
-
-- void ConvertX86p32_32BGR888() __attribute__ ((alias ("_ConvertX86p32_32BGR888")));
-- void ConvertX86p32_32RGBA888() __attribute__ ((alias ("_ConvertX86p32_32RGBA888")));
-- void ConvertX86p32_32BGRA888() __attribute__ ((alias ("_ConvertX86p32_32BGRA888")));
-- void ConvertX86p32_24RGB888() __attribute__ ((alias ("_ConvertX86p32_24RGB888")));
-- void ConvertX86p32_24BGR888() __attribute__ ((alias ("_ConvertX86p32_24BGR888")));
-- void ConvertX86p32_16RGB565() __attribute__ ((alias ("_ConvertX86p32_16RGB565")));
-- void ConvertX86p32_16BGR565() __attribute__ ((alias ("_ConvertX86p32_16BGR565")));
-- void ConvertX86p32_16RGB555() __attribute__ ((alias ("_ConvertX86p32_16RGB555")));
-- void ConvertX86p32_16BGR555() __attribute__ ((alias ("_ConvertX86p32_16BGR555")));
-- void ConvertX86p32_8RGB332() __attribute__ ((alias ("_ConvertX86p32_8RGB332")));
-+ extern void _ConvertX86p16_16BGR565();
-+ extern void _ConvertX86p16_16RGB555();
-+ extern void _ConvertX86p16_16BGR555();
-+ extern void _ConvertX86p16_8RGB332();
-
--#if 0
-- void ConvertX86p16_32RGB888() __attribute__ ((alias ("_ConvertX86p16_32RGB888")));
-- void ConvertX86p16_32BGR888() __attribute__ ((alias ("_ConvertX86p16_32BGR888")));
-- void ConvertX86p16_32RGBA888() __attribute__ ((alias ("_ConvertX86p16_32RGBA888")));
-- void ConvertX86p16_32BGRA888() __attribute__ ((alias ("_ConvertX86p16_32BGRA888")));
-- void ConvertX86p16_24RGB888() __attribute__ ((alias ("_ConvertX86p16_24RGB888")));
-- void ConvertX86p16_24BGR888() __attribute__ ((alias ("_ConvertX86p16_24BGR888")));
--#endif
-- void ConvertX86p16_16BGR565() __attribute__ ((alias ("_ConvertX86p16_16BGR565")));
-- void ConvertX86p16_16RGB555() __attribute__ ((alias ("_ConvertX86p16_16RGB555")));
-- void ConvertX86p16_16BGR555() __attribute__ ((alias ("_ConvertX86p16_16BGR555")));
-- void ConvertX86p16_8RGB332() __attribute__ ((alias ("_ConvertX86p16_8RGB332")));
-
--#if 0
-- void CopyX86p_4byte() __attribute__ ((alias ("_CopyX86p_4byte")));
-- void CopyX86p_3byte() __attribute__ ((alias ("_CopyX86p_3byte")));
-- void CopyX86p_2byte() __attribute__ ((alias ("_CopyX86p_2byte")));
-- void CopyX86p_1byte() __attribute__ ((alias ("_CopyX86p_1byte")));
-+ #define Hermes_X86_CPU _Hermes_X86_CPU
-
-- void ConvertX86pI8_32() __attribute__ ((alias ("_ConvertX86pI8_32")));
-- void ConvertX86pI8_24() __attribute__ ((alias ("_ConvertX86pI8_24")));
-- void ConvertX86pI8_16() __attribute__ ((alias ("_ConvertX86pI8_16")));
-+ #define ConvertX86 _ConvertX86
-+
-+ #define ConvertX86p32_32BGR888 _ConvertX86p32_32BGR888
-+ #define ConvertX86p32_32RGBA888 _ConvertX86p32_32RGBA888
-+ #define ConvertX86p32_32BGRA888 _ConvertX86p32_32BGRA888
-+ #define ConvertX86p32_24RGB888 _ConvertX86p32_24RGB888
-+ #define ConvertX86p32_24BGR888 _ConvertX86p32_24BGR888
-+ #define ConvertX86p32_16RGB565 _ConvertX86p32_16RGB565
-+ #define ConvertX86p32_16BGR565 _ConvertX86p32_16BGR565
-+ #define ConvertX86p32_16RGB555 _ConvertX86p32_16RGB555
-+ #define ConvertX86p32_16BGR555 _ConvertX86p32_16BGR555
-+ #define ConvertX86p32_8RGB332 _ConvertX86p32_8RGB332
-+
-+ #define ConvertX86p16_16BGR565 _ConvertX86p16_16BGR565
-+ #define ConvertX86p16_16RGB555 _ConvertX86p16_16RGB555
-+ #define ConvertX86p16_16BGR555 _ConvertX86p16_16BGR555
-+ #define ConvertX86p16_8RGB332 _ConvertX86p16_8RGB332
-
-- extern int ConvertX86p16_32RGB888_LUT_X86[512] __attribute__ ((alias ("_ConvertX86p16_32RGB888_LUT_X86")));
-- extern int ConvertX86p16_32BGR888_LUT_X86[512] __attribute__ ((alias ("_ConvertX86p16_32BGR888_LUT_X86")));
-- extern int ConvertX86p16_32RGBA888_LUT_X86[512] __attribute__ ((alias ("_ConvertX86p16_32RGBA888_LUT_X86")));
-- extern int ConvertX86p16_32BGRA888_LUT_X86[512] __attribute__ ((alias ("_ConvertX86p16_32BGRA888_LUT_X86")));
--#endif
-
- #ifdef __cplusplus
- }
diff --git a/devel/sdl12/files/patch-src_joystick_bsd_SDL__sysjoystick.c b/devel/sdl12/files/patch-src_joystick_bsd_SDL__sysjoystick.c
index e9781d32f991..629ecd38b9c1 100644
--- a/devel/sdl12/files/patch-src_joystick_bsd_SDL__sysjoystick.c
+++ b/devel/sdl12/files/patch-src_joystick_bsd_SDL__sysjoystick.c
@@ -1,6 +1,6 @@
---- src/joystick/bsd/SDL_sysjoystick.c.orig Fri Nov 12 22:24:46 2004
-+++ src/joystick/bsd/SDL_sysjoystick.c Tue Nov 8 20:19:38 2005
-@@ -122,6 +122,12 @@
+--- src/joystick/bsd/SDL_sysjoystick.c.orig Mon May 1 12:02:40 2006
++++ src/joystick/bsd/SDL_sysjoystick.c Wed Jul 5 01:11:57 2006
+@@ -123,6 +123,12 @@
struct report_desc *repdesc;
struct report inreport;
int axis_map[JOYAXE_count]; /* map present JOYAXE_* to 0,1,..*/
@@ -13,7 +13,7 @@
};
static char *joynames[MAX_JOYS];
-@@ -255,6 +261,12 @@
+@@ -257,6 +263,12 @@
joy->hwdata = hw;
hw->fd = fd;
hw->path = strdup(path);
@@ -23,12 +23,12 @@
+ hw->ymin = 0xffff;
+ hw->xmax = 0;
+ hw->ymax = 0;
- if (! strncmp(path, "/dev/joy", 8)) {
+ if (! SDL_strncmp(path, "/dev/joy", 8)) {
hw->type = BSDJOY_JOY;
joy->naxes = 2;
-@@ -372,43 +384,42 @@
+@@ -380,43 +392,42 @@
- #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+ #if defined(__FREEBSD__) || SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H
struct joystick gameport;
- static int x, y, xmin = 0xffff, ymin = 0xffff, xmax = 0, ymax = 0;
diff --git a/devel/sdl12/files/patch-src_video_SDL__yuv__mmx.c b/devel/sdl12/files/patch-src_video_SDL__yuv__mmx.c
deleted file mode 100644
index 836b5ee181f2..000000000000
--- a/devel/sdl12/files/patch-src_video_SDL__yuv__mmx.c
+++ /dev/null
@@ -1,324 +0,0 @@
-
-$FreeBSD$
-
---- src/video/SDL_yuv_mmx.c.orig
-+++ src/video/SDL_yuv_mmx.c
-@@ -30,42 +30,31 @@
-
- #include "SDL_types.h"
-
--#if __GNUC__ > 2
--# undef GCC2_HACK
--#else
--# define GCC2_HACK
--#endif
--
--
--#if defined(GCC2_HACK) && defined (__ELF__)
--#define ASM_VAR(X) _##X
--#else
--#define ASM_VAR(X) X
--#endif
-+#define ASM_ARRAY(x) x[] __asm__("_" #x) __attribute__((used))
-
--static volatile unsigned int ASM_VAR(MMX_0080w)[] = {0x00800080, 0x00800080};
--static volatile unsigned int ASM_VAR(MMX_00FFw)[] = {0x00ff00ff, 0x00ff00ff};
--static volatile unsigned int ASM_VAR(MMX_FF00w)[] = {0xff00ff00, 0xff00ff00};
-+static unsigned int ASM_ARRAY(MMX_0080w) = {0x00800080, 0x00800080};
-+static unsigned int ASM_ARRAY(MMX_00FFw) = {0x00ff00ff, 0x00ff00ff};
-+static unsigned int ASM_ARRAY(MMX_FF00w) = {0xff00ff00, 0xff00ff00};
-
--static volatile unsigned short ASM_VAR(MMX_Ycoeff)[] = {0x004a, 0x004a, 0x004a, 0x004a};
-+static unsigned short ASM_ARRAY(MMX_Ycoeff) = {0x004a, 0x004a, 0x004a, 0x004a};
-
--static volatile unsigned short ASM_VAR(MMX_UbluRGB)[] = {0x0072, 0x0072, 0x0072, 0x0072};
--static volatile unsigned short ASM_VAR(MMX_VredRGB)[] = {0x0059, 0x0059, 0x0059, 0x0059};
--static volatile unsigned short ASM_VAR(MMX_UgrnRGB)[] = {0xffea, 0xffea, 0xffea, 0xffea};
--static volatile unsigned short ASM_VAR(MMX_VgrnRGB)[] = {0xffd2, 0xffd2, 0xffd2, 0xffd2};
-+static unsigned short ASM_ARRAY(MMX_UbluRGB) = {0x0072, 0x0072, 0x0072, 0x0072};
-+static unsigned short ASM_ARRAY(MMX_VredRGB) = {0x0059, 0x0059, 0x0059, 0x0059};
-+static unsigned short ASM_ARRAY(MMX_UgrnRGB) = {0xffea, 0xffea, 0xffea, 0xffea};
-+static unsigned short ASM_ARRAY(MMX_VgrnRGB) = {0xffd2, 0xffd2, 0xffd2, 0xffd2};
-
--static volatile unsigned short ASM_VAR(MMX_Ublu5x5)[] = {0x0081, 0x0081, 0x0081, 0x0081};
--static volatile unsigned short ASM_VAR(MMX_Vred5x5)[] = {0x0066, 0x0066, 0x0066, 0x0066};
--static volatile unsigned short ASM_VAR(MMX_Ugrn555)[] = {0xffe7, 0xffe7, 0xffe7, 0xffe7};
--static volatile unsigned short ASM_VAR(MMX_Vgrn555)[] = {0xffcc, 0xffcc, 0xffcc, 0xffcc};
--static volatile unsigned short ASM_VAR(MMX_Ugrn565)[] = {0xffe8, 0xffe8, 0xffe8, 0xffe8};
--static volatile unsigned short ASM_VAR(MMX_Vgrn565)[] = {0xffcd, 0xffcd, 0xffcd, 0xffcd};
-+static unsigned short ASM_ARRAY(MMX_Ublu5x5) = {0x0081, 0x0081, 0x0081, 0x0081};
-+static unsigned short ASM_ARRAY(MMX_Vred5x5) = {0x0066, 0x0066, 0x0066, 0x0066};
-+static unsigned short ASM_ARRAY(MMX_Ugrn555) = {0xffe7, 0xffe7, 0xffe7, 0xffe7};
-+static unsigned short ASM_ARRAY(MMX_Vgrn555) = {0xffcc, 0xffcc, 0xffcc, 0xffcc};
-+static unsigned short ASM_ARRAY(MMX_Ugrn565) = {0xffe8, 0xffe8, 0xffe8, 0xffe8};
-+static unsigned short ASM_ARRAY(MMX_Vgrn565) = {0xffcd, 0xffcd, 0xffcd, 0xffcd};
-
--static volatile unsigned short ASM_VAR(MMX_red555)[] = {0x7c00, 0x7c00, 0x7c00, 0x7c00};
--static volatile unsigned short ASM_VAR(MMX_red565)[] = {0xf800, 0xf800, 0xf800, 0xf800};
--static volatile unsigned short ASM_VAR(MMX_grn555)[] = {0x03e0, 0x03e0, 0x03e0, 0x03e0};
--static volatile unsigned short ASM_VAR(MMX_grn565)[] = {0x07e0, 0x07e0, 0x07e0, 0x07e0};
--static volatile unsigned short ASM_VAR(MMX_blu5x5)[] = {0x001f, 0x001f, 0x001f, 0x001f};
-+static unsigned short ASM_ARRAY(MMX_red555) = {0x7c00, 0x7c00, 0x7c00, 0x7c00};
-+static unsigned short ASM_ARRAY(MMX_red565) = {0xf800, 0xf800, 0xf800, 0xf800};
-+static unsigned short ASM_ARRAY(MMX_grn555) = {0x03e0, 0x03e0, 0x03e0, 0x03e0};
-+static unsigned short ASM_ARRAY(MMX_grn565) = {0x07e0, 0x07e0, 0x07e0, 0x07e0};
-+static unsigned short ASM_ARRAY(MMX_blu5x5) = {0x001f, 0x001f, 0x001f, 0x001f};
-
- /**
- This MMX assembler is my first assembler/MMX program ever.
-@@ -127,21 +116,12 @@
- "movd (%2), %%mm2\n" // 0 0 0 0 l3 l2 l1 l0
- "punpcklbw %%mm7,%%mm1\n" // 0 v3 0 v2 00 v1 00 v0
- "punpckldq %%mm1,%%mm1\n" // 00 v1 00 v0 00 v1 00 v0
--#ifdef GCC2_HACK
- "psubw _MMX_0080w,%%mm1\n" // mm1-128:r1 r1 r0 r0 r1 r1 r0 r0
--#else
-- "psubw %[_MMX_0080w],%%mm1\n" // mm1-128:r1 r1 r0 r0 r1 r1 r0 r0
--#endif
-
- // create Cr_g (result in mm0)
- "movq %%mm1,%%mm0\n" // r1 r1 r0 r0 r1 r1 r0 r0
--#ifdef GCC2_HACK
- "pmullw _MMX_VgrnRGB,%%mm0\n"// red*-46dec=0.7136*64
- "pmullw _MMX_VredRGB,%%mm1\n"// red*89dec=1.4013*64
--#else
-- "pmullw %[_MMX_VgrnRGB],%%mm0\n"// red*-46dec=0.7136*64
-- "pmullw %[_MMX_VredRGB],%%mm1\n"// red*89dec=1.4013*64
--#endif
- "psraw $6, %%mm0\n" // red=red/64
- "psraw $6, %%mm1\n" // red=red/64
-
-@@ -150,13 +130,8 @@
- "movq (%2,%4),%%mm3\n" // 0 0 0 0 L3 L2 L1 L0
- "punpckldq %%mm3,%%mm2\n" // L3 L2 L1 L0 l3 l2 l1 l0
- "movq %%mm2,%%mm4\n" // L3 L2 L1 L0 l3 l2 l1 l0
--#ifdef GCC2_HACK
- "pand _MMX_FF00w,%%mm2\n" // L3 0 L1 0 l3 0 l1 0
- "pand _MMX_00FFw,%%mm4\n" // 0 L2 0 L0 0 l2 0 l0
--#else
-- "pand %[_MMX_FF00w],%%mm2\n" // L3 0 L1 0 l3 0 l1 0
-- "pand %[_MMX_00FFw],%%mm4\n" // 0 L2 0 L0 0 l2 0 l0
--#endif
- "psrlw $8,%%mm2\n" // 0 L3 0 L1 0 l3 0 l1
-
- // create R (result in mm6)
-@@ -173,20 +148,11 @@
- "movd (%1), %%mm1\n" // 0 0 0 0 u3 u2 u1 u0
- "punpcklbw %%mm7,%%mm1\n" // 0 u3 0 u2 00 u1 00 u0
- "punpckldq %%mm1,%%mm1\n" // 00 u1 00 u0 00 u1 00 u0
--#ifdef GCC2_HACK
- "psubw _MMX_0080w,%%mm1\n" // mm1-128:u1 u1 u0 u0 u1 u1 u0 u0
--#else
-- "psubw %[_MMX_0080w],%%mm1\n" // mm1-128:u1 u1 u0 u0 u1 u1 u0 u0
--#endif
- // create Cb_g (result in mm5)
- "movq %%mm1,%%mm5\n" // u1 u1 u0 u0 u1 u1 u0 u0
--#ifdef GCC2_HACK
- "pmullw _MMX_UgrnRGB,%%mm5\n" // blue*-109dec=1.7129*64
- "pmullw _MMX_UbluRGB,%%mm1\n" // blue*114dec=1.78125*64
--#else
-- "pmullw %[_MMX_UgrnRGB],%%mm5\n" // blue*-109dec=1.7129*64
-- "pmullw %[_MMX_UbluRGB],%%mm1\n" // blue*114dec=1.78125*64
--#endif
- "psraw $6, %%mm5\n" // blue=red/64
- "psraw $6, %%mm1\n" // blue=blue/64
-
-@@ -268,17 +234,7 @@
- "popl %%ebx\n"
- :
- : "m" (cr), "r"(cb),"r"(lum),
-- "r"(row1),"r"(cols),"r"(row2),"m"(x),"m"(y),"m"(mod)
--#ifndef GCC2_HACK
-- ,[_MMX_0080w] "m" (*MMX_0080w),
-- [_MMX_00FFw] "m" (*MMX_00FFw),
-- [_MMX_FF00w] "m" (*MMX_FF00w),
-- [_MMX_VgrnRGB] "m" (*MMX_VgrnRGB),
-- [_MMX_VredRGB] "m" (*MMX_VredRGB),
-- [_MMX_UgrnRGB] "m" (*MMX_UgrnRGB),
-- [_MMX_UbluRGB] "m" (*MMX_UbluRGB)
--#endif
-- );
-+ "r"(row1),"r"(cols),"r"(row2),"m"(x),"m"(y),"m"(mod));
- }
-
- void Color565DitherYV12MMX1X( int *colortab, Uint32 *rgb_2_pix,
-@@ -307,48 +263,21 @@
- "movd (%%ebx), %%mm1\n" // 4 Cr 0 0 0 0 v3 v2 v1 v0
- "punpcklbw %%mm7, %%mm0\n" // 4 W cb 0 u3 0 u2 0 u1 0 u0
- "punpcklbw %%mm7, %%mm1\n" // 4 W cr 0 v3 0 v2 0 v1 0 v0
--#ifdef GCC2_HACK
- "psubw _MMX_0080w, %%mm0\n"
- "psubw _MMX_0080w, %%mm1\n"
--#else
-- "psubw %[_MMX_0080w], %%mm0\n"
-- "psubw %[_MMX_0080w], %%mm1\n"
--#endif
- "movq %%mm0, %%mm2\n" // Cb 0 u3 0 u2 0 u1 0 u0
- "movq %%mm1, %%mm3\n" // Cr
--#ifdef GCC2_HACK
- "pmullw _MMX_Ugrn565, %%mm2\n" // Cb2green 0 R3 0 R2 0 R1 0 R0
--#else
-- "pmullw %[_MMX_Ugrn565], %%mm2\n" // Cb2green 0 R3 0 R2 0 R1 0 R0
--#endif
- "movq (%2), %%mm6\n" // L1 l7 L6 L5 L4 L3 L2 L1 L0
--#ifdef GCC2_HACK
- "pmullw _MMX_Ublu5x5, %%mm0\n" // Cb2blue
- "pand _MMX_00FFw, %%mm6\n" // L1 00 L6 00 L4 00 L2 00 L0
- "pmullw _MMX_Vgrn565, %%mm3\n" // Cr2green
--#else
-- "pmullw %[_MMX_Ublu5x5], %%mm0\n" // Cb2blue
-- "pand %[_MMX_00FFw], %%mm6\n" // L1 00 L6 00 L4 00 L2 00 L0
-- "pmullw %[_MMX_Vgrn565], %%mm3\n" // Cr2green
--#endif
- "movq (%2), %%mm7\n" // L2
--#ifdef GCC2_HACK
- "pmullw _MMX_Vred5x5, %%mm1\n" // Cr2red
--#else
-- "pmullw %[_MMX_Vred5x5], %%mm1\n" // Cr2red
--#endif
- "psrlw $8, %%mm7\n" // L2 00 L7 00 L5 00 L3 00 L1
--#ifdef GCC2_HACK
- "pmullw _MMX_Ycoeff, %%mm6\n" // lum1
--#else
-- "pmullw %[_MMX_Ycoeff], %%mm6\n" // lum1
--#endif
- "paddw %%mm3, %%mm2\n" // Cb2green + Cr2green == green
--#ifdef GCC2_HACK
- "pmullw _MMX_Ycoeff, %%mm7\n" // lum2
--#else
-- "pmullw %[_MMX_Ycoeff], %%mm7\n" // lum2
--#endif
-
- "movq %%mm6, %%mm4\n" // lum1
- "paddw %%mm0, %%mm6\n" // lum1 +blue 00 B6 00 B4 00 B2 00 B0
-@@ -366,20 +295,11 @@
- "punpcklbw %%mm4, %%mm4\n"
- "punpcklbw %%mm5, %%mm5\n"
-
--#ifdef GCC2_HACK
- "pand _MMX_red565, %%mm4\n"
--#else
-- "pand %[_MMX_red565], %%mm4\n"
--#endif
- "psllw $3, %%mm5\n" // GREEN 1
- "punpcklbw %%mm6, %%mm6\n"
--#ifdef GCC2_HACK
- "pand _MMX_grn565, %%mm5\n"
- "pand _MMX_red565, %%mm6\n"
--#else
-- "pand %[_MMX_grn565], %%mm5\n"
-- "pand %[_MMX_red565], %%mm6\n"
--#endif
- "por %%mm5, %%mm4\n" //
- "psrlw $11, %%mm6\n" // BLUE 1
- "movq %%mm3, %%mm5\n" // lum2
-@@ -393,44 +313,23 @@
- "packuswb %%mm3, %%mm3\n"
- "packuswb %%mm5, %%mm5\n"
- "packuswb %%mm7, %%mm7\n"
--#ifdef GCC2_HACK
- "pand _MMX_00FFw, %%mm6\n" // L3
--#else
-- "pand %[_MMX_00FFw], %%mm6\n" // L3
--#endif
- "punpcklbw %%mm3, %%mm3\n"
- "punpcklbw %%mm5, %%mm5\n"
--#ifdef GCC2_HACK
- "pmullw _MMX_Ycoeff, %%mm6\n" // lum3
--#else
-- "pmullw %[_MMX_Ycoeff], %%mm6\n" // lum3
--#endif
- "punpcklbw %%mm7, %%mm7\n"
- "psllw $3, %%mm5\n" // GREEN 2
--#ifdef GCC2_HACK
- "pand _MMX_red565, %%mm7\n"
- "pand _MMX_red565, %%mm3\n"
--#else
-- "pand %[_MMX_red565], %%mm7\n"
-- "pand %[_MMX_red565], %%mm3\n"
--#endif
- "psrlw $11, %%mm7\n" // BLUE 2
--#ifdef GCC2_HACK
- "pand _MMX_grn565, %%mm5\n"
--#else
-- "pand %[_MMX_grn565], %%mm5\n"
--#endif
- "por %%mm7, %%mm3\n"
- "movq (%2,%4), %%mm7\n" // L4 load lum2
- "por %%mm5, %%mm3\n" //
- "psrlw $8, %%mm7\n" // L4
- "movq %%mm4, %%mm5\n"
- "punpcklwd %%mm3, %%mm4\n"
--#ifdef GCC2_HACK
- "pmullw _MMX_Ycoeff, %%mm7\n" // lum4
--#else
-- "pmullw %[_MMX_Ycoeff], %%mm7\n" // lum4
--#endif
- "punpckhwd %%mm3, %%mm5\n"
-
- "movq %%mm4, (%3)\n" // write row1
-@@ -457,20 +356,11 @@
- "punpcklbw %%mm5, %%mm5\n"
- "punpcklbw %%mm6, %%mm6\n"
- "psllw $3, %%mm5\n" // GREEN 3
--#ifdef GCC2_HACK
- "pand _MMX_red565, %%mm4\n"
--#else
-- "pand %[_MMX_red565], %%mm4\n"
--#endif
- "psraw $6, %%mm3\n" // psr 6
- "psraw $6, %%mm0\n"
--#ifdef GCC2_HACK
- "pand _MMX_red565, %%mm6\n" // BLUE
- "pand _MMX_grn565, %%mm5\n"
--#else
-- "pand %[_MMX_red565], %%mm6\n" // BLUE
-- "pand %[_MMX_grn565], %%mm5\n"
--#endif
- "psrlw $11, %%mm6\n" // BLUE 3
- "por %%mm5, %%mm4\n"
- "psraw $6, %%mm7\n"
-@@ -481,20 +371,11 @@
- "punpcklbw %%mm3, %%mm3\n"
- "punpcklbw %%mm0, %%mm0\n"
- "punpcklbw %%mm7, %%mm7\n"
--#ifdef GCC2_HACK
- "pand _MMX_red565, %%mm3\n"
- "pand _MMX_red565, %%mm7\n" // BLUE
--#else
-- "pand %[_MMX_red565], %%mm3\n"
-- "pand %[_MMX_red565], %%mm7\n" // BLUE
--#endif
- "psllw $3, %%mm0\n" // GREEN 4
- "psrlw $11, %%mm7\n"
--#ifdef GCC2_HACK
- "pand _MMX_grn565, %%mm0\n"
--#else
-- "pand %[_MMX_grn565], %%mm0\n"
--#endif
- "por %%mm7, %%mm3\n"
- "por %%mm0, %%mm3\n"
-
-@@ -526,21 +407,7 @@
- "popl %%ebx\n"
- :
- :"m" (cr), "r"(cb),"r"(lum),
-- "r"(row1),"r"(cols),"r"(row2),"m"(x),"m"(y),"m"(mod)
--#ifndef GCC2_HACK
-- ,[_MMX_0080w] "m" (*MMX_0080w),
-- [_MMX_Ugrn565] "m" (*MMX_Ugrn565),
-- [_MMX_Ublu5x5] "m" (*MMX_Ublu5x5),
-- [_MMX_00FFw] "m" (*MMX_00FFw),
-- [_MMX_Vgrn565] "m" (*MMX_Vgrn565),
-- [_MMX_Vred5x5] "m" (*MMX_Vred5x5),
-- [_MMX_Ycoeff] "m" (*MMX_Ycoeff),
-- [_MMX_red565] "m" (*MMX_red565),
-- [_MMX_grn565] "m" (*MMX_grn565)
--#endif
-- );
-+ "r"(row1),"r"(cols),"r"(row2),"m"(x),"m"(y),"m"(mod));
- }
--
--#undef GCC2_HACK
-
- #endif /* GCC i386 inline assembly */
diff --git a/devel/sdl12/pkg-plist b/devel/sdl12/pkg-plist
index 685526eba179..03d578e2c8cd 100644
--- a/devel/sdl12/pkg-plist
+++ b/devel/sdl12/pkg-plist
@@ -1,85 +1,301 @@
-bin/sdl11-config
-include/SDL11/SDL.h
-include/SDL11/SDL_active.h
-include/SDL11/SDL_audio.h
-include/SDL11/SDL_byteorder.h
-include/SDL11/SDL_cdrom.h
-include/SDL11/SDL_copying.h
-include/SDL11/SDL_cpuinfo.h
-include/SDL11/SDL_endian.h
-include/SDL11/SDL_error.h
-include/SDL11/SDL_events.h
-include/SDL11/SDL_getenv.h
-include/SDL11/SDL_joystick.h
-include/SDL11/SDL_keyboard.h
-include/SDL11/SDL_keysym.h
-include/SDL11/SDL_loadso.h
-include/SDL11/SDL_main.h
-include/SDL11/SDL_mouse.h
-include/SDL11/SDL_mutex.h
-include/SDL11/SDL_name.h
-include/SDL11/SDL_opengl.h
-include/SDL11/SDL_quit.h
-include/SDL11/SDL_rwops.h
-include/SDL11/SDL_syswm.h
-include/SDL11/SDL_thread.h
-include/SDL11/SDL_timer.h
-include/SDL11/SDL_types.h
-include/SDL11/SDL_version.h
-include/SDL11/SDL_video.h
-include/SDL11/begin_code.h
-include/SDL11/close_code.h
-lib/libSDL-1.1.a
-lib/libSDL-1.1.la
-lib/libSDL-1.1.so
-lib/libSDL-1.1.so.7
-lib/libSDLmain-1.1.a
-share/aclocal/sdl11.m4
-%%EXAMPLESDIR%%/COPYING
-%%EXAMPLESDIR%%/Makefile.am
-%%EXAMPLESDIR%%/Makefile.in
-%%EXAMPLESDIR%%/README
-%%EXAMPLESDIR%%/acinclude.m4
-%%EXAMPLESDIR%%/aclocal.m4
-%%EXAMPLESDIR%%/autogen.sh
-%%EXAMPLESDIR%%/checkkeys.c
-%%EXAMPLESDIR%%/configure
-%%EXAMPLESDIR%%/configure.in
-%%EXAMPLESDIR%%/graywin.c
-%%EXAMPLESDIR%%/icon.bmp
-%%EXAMPLESDIR%%/loopwave.c
-%%EXAMPLESDIR%%/missing
-%%EXAMPLESDIR%%/moose.dat
-%%EXAMPLESDIR%%/picture.xbm
-%%EXAMPLESDIR%%/sail.bmp
-%%EXAMPLESDIR%%/sample.bmp
-%%EXAMPLESDIR%%/sample.wav
-%%EXAMPLESDIR%%/testalpha.c
-%%EXAMPLESDIR%%/testbitmap.c
-%%EXAMPLESDIR%%/testblitspeed.c
-%%EXAMPLESDIR%%/testcdrom.c
-%%EXAMPLESDIR%%/testcpuinfo.c
-%%EXAMPLESDIR%%/testdyngl.c
-%%EXAMPLESDIR%%/testendian.c
-%%EXAMPLESDIR%%/testerror.c
-%%EXAMPLESDIR%%/testgamma.c
-%%EXAMPLESDIR%%/testgl.c
-%%EXAMPLESDIR%%/testhread.c
-%%EXAMPLESDIR%%/testjoystick.c
-%%EXAMPLESDIR%%/testkeys.c
-%%EXAMPLESDIR%%/testlock.c
-%%EXAMPLESDIR%%/testoverlay.c
-%%EXAMPLESDIR%%/testoverlay2.c
-%%EXAMPLESDIR%%/testpalette.c
-%%EXAMPLESDIR%%/testsem.c
-%%EXAMPLESDIR%%/testsprite.c
-%%EXAMPLESDIR%%/testtimer.c
-%%EXAMPLESDIR%%/testtypes.c
-%%EXAMPLESDIR%%/testver.c
-%%EXAMPLESDIR%%/testvidinfo.c
-%%EXAMPLESDIR%%/testwin.c
-%%EXAMPLESDIR%%/testwm.c
-%%EXAMPLESDIR%%/threadwin.c
-%%EXAMPLESDIR%%/torturethread.c
-@dirrm %%EXAMPLESDIR%%
-@dirrmtry include/SDL11
+bin/sdl-config
+include/SDL/SDL.h
+include/SDL/SDL_active.h
+include/SDL/SDL_audio.h
+include/SDL/SDL_byteorder.h
+include/SDL/SDL_cdrom.h
+include/SDL/SDL_config.h
+include/SDL/SDL_config_amiga.h
+include/SDL/SDL_config_dreamcast.h
+include/SDL/SDL_config_macos.h
+include/SDL/SDL_config_macosx.h
+include/SDL/SDL_config_minimal.h
+include/SDL/SDL_config_os2.h
+include/SDL/SDL_config_win32.h
+include/SDL/SDL_copying.h
+include/SDL/SDL_cpuinfo.h
+include/SDL/SDL_endian.h
+include/SDL/SDL_error.h
+include/SDL/SDL_events.h
+include/SDL/SDL_getenv.h
+include/SDL/SDL_joystick.h
+include/SDL/SDL_keyboard.h
+include/SDL/SDL_keysym.h
+include/SDL/SDL_loadso.h
+include/SDL/SDL_main.h
+include/SDL/SDL_mouse.h
+include/SDL/SDL_mutex.h
+include/SDL/SDL_name.h
+include/SDL/SDL_opengl.h
+include/SDL/SDL_platform.h
+include/SDL/SDL_quit.h
+include/SDL/SDL_rwops.h
+include/SDL/SDL_stdinc.h
+include/SDL/SDL_syswm.h
+include/SDL/SDL_thread.h
+include/SDL/SDL_timer.h
+include/SDL/SDL_types.h
+include/SDL/SDL_version.h
+include/SDL/SDL_video.h
+include/SDL/begin_code.h
+include/SDL/close_code.h
+lib/libSDL.a
+lib/libSDL.la
+lib/libSDL.so
+lib/libSDL.so.11
+lib/libSDLmain.a
+libdata/pkgconfig/sdl.pc
+share/aclocal/sdl.m4
+%%PORTDOCS%%%%DOCSDIR%%/BUGS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/CREDITS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README-SDL.txt
+%%PORTDOCS%%%%DOCSDIR%%/WhatsNew
+%%PORTDOCS%%%%DOCSDIR%%/docs.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/audio.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/cdrom.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/event.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/eventfunctions.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/eventstructures.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/general.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/guide.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/guideaboutsdldoc.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/guideaudioexamples.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/guidebasicsinit.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/guidecdromexamples.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/guidecredits.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/guideeventexamples.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/guideexamples.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/guideinput.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/guideinputkeyboard.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/guidepreface.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/guidethebasics.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/guidetimeexamples.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/guidevideo.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/guidevideoopengl.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/index.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/joystick.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/reference.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlactiveevent.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdladdtimer.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlaudiocvt.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlaudiospec.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlblitsurface.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlbuildaudiocvt.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcd.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcdclose.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcdeject.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcdname.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcdnumdrives.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcdopen.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcdpause.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcdplay.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcdplaytracks.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcdresume.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcdstatus.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcdstop.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcdtrack.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcloseaudio.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcolor.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcondbroadcast.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcondsignal.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcondwait.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcondwaittimeout.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlconvertaudio.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlconvertsurface.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcreatecond.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcreatecursor.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcreatemutex.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcreatergbsurface.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcreatergbsurfacefrom.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcreatesemaphore.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcreatethread.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlcreateyuvoverlay.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdldelay.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdldestroycond.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdldestroymutex.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdldestroysemaphore.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdldisplayformat.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdldisplayformatalpha.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdldisplayyuvoverlay.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlenablekeyrepeat.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlenableunicode.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlenvvars.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlevent.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdleventstate.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlexposeevent.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlfillrect.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlflip.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlfreecursor.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlfreesurface.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlfreewav.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlfreeyuvoverlay.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgetappstate.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgetaudiostatus.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgetcliprect.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgetcursor.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgeterror.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgeteventfilter.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgetgammaramp.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgetkeyname.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgetkeystate.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgetmodstate.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgetmousestate.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgetrelativemousestate.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgetrgb.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgetrgba.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgetthreadid.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgetticks.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgetvideoinfo.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlgetvideosurface.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlglattr.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlglgetattribute.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlglgetprocaddress.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlglloadlibrary.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlglsetattribute.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlglswapbuffers.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlinit.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlinitsubsystem.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoyaxisevent.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoyballevent.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoybuttonevent.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoyhatevent.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoystickclose.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoystickeventstate.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoystickgetaxis.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoystickgetball.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoystickgetbutton.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoystickgethat.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoystickindex.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoystickname.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoysticknumaxes.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoysticknumballs.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoysticknumbuttons.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoysticknumhats.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoystickopen.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoystickopened.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdljoystickupdate.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlkey.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlkeyboardevent.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlkeysym.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlkillthread.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdllistmodes.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlloadbmp.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlloadwav.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdllockaudio.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdllocksurface.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdllockyuvoverlay.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlmaprgb.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlmaprgba.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlmixaudio.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlmousebuttonevent.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlmousemotionevent.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlmutexp.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlmutexv.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlnumjoysticks.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlopenaudio.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdloverlay.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlpalette.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlpauseaudio.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlpeepevents.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlpix%%PORTOBJFORMAT%%ormat.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlpollevent.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlpumpevents.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlpushevent.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlquit.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlquitevent.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlquitsubsystem.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlrect.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlremovetimer.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlresizeevent.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsavebmp.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsempost.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsemtrywait.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsemvalue.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsemwait.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsemwaittimeout.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsetalpha.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsetcliprect.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsetcolorkey.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsetcolors.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsetcursor.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlseteventfilter.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsetgamma.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsetgammaramp.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsetmodstate.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsetpalette.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsettimer.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsetvideomode.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlshowcursor.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsurface.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlsyswmevent.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlthreadid.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlunlockaudio.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlunlocksurface.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlunlockyuvoverlay.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlupdaterect.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlupdaterects.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdluserevent.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlvideodrivername.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlvideoinfo.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlvideomodeok.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlwaitevent.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlwaitthread.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlwarpmouse.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlwasinit.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlwmgetcaption.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlwmgrabinput.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlwmiconifywindow.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlwmsetcaption.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlwmseticon.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/sdlwmtogglefullscreen.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/thread.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/time.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/video.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/html/wm.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/images/rainbow.gif
+%%PORTDOCS%%%%DOCSDIR%%/docs/index.html
+%%PORTDOCS%%%%EXAMPLESDIR%%/checkkeys.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/graywin.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/icon.bmp
+%%PORTDOCS%%%%EXAMPLESDIR%%/loopwave.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/moose.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/picture.xbm
+%%PORTDOCS%%%%EXAMPLESDIR%%/sail.bmp
+%%PORTDOCS%%%%EXAMPLESDIR%%/sample.bmp
+%%PORTDOCS%%%%EXAMPLESDIR%%/sample.wav
+%%PORTDOCS%%%%EXAMPLESDIR%%/testalpha.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/testbitmap.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/testblitspeed.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/testcdrom.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/testcursor.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/testdyngl.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/testerror.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/testfile.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/testgamma.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/testgl.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/testhread.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/testiconv.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/testjoystick.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/testkeys.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/testlock.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/testoverlay.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/testoverlay2.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/testpalette.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/testplatform.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/testsem.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/testsprite.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/testtimer.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/testver.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/testvidinfo.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/testwin.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/testwm.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/threadwin.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/torturethread.c
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/images
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrm include/SDL