ports/99943: [UPDATE] devel/sdl12 update to 1.2.11
Stanislav Sedov
ssedov at mbsd.msk.ru
Sat Jul 8 21:20:16 UTC 2006
>Number: 99943
>Category: ports
>Synopsis: [UPDATE] devel/sdl12 update to 1.2.11
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sat Jul 08 21:20:14 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Stanislav Sedov
>Release: FreeBSD 7.0-CURRENT i386
>Organization:
MBSD labs, Inc.
>Environment:
System: FreeBSD fonon.realnet 7.0-CURRENT FreeBSD 7.0-CURRENT #7: Sun Jun 18 20:51:36 MSD 2006 root at fonon.realnet:/work/src/fbsd-cur/src/sys/i386/compile/FONON i386
>Description:
Update for sdl library to 1.2.11 version.
This versions provides a lot of new features and bugfixes over 1.2.9.
Additionally, I've added support for DirectFB and GGI.
Note: files
files/patch-ac
files/patch-ag
files/patch-ah
files/patch-ai
files/patch-aj
files/patch-ak
files/patch-src_hermes_HeadMMX.h
files/patch-src_hermes_HeadX86.h
files/patch-src_video_SDL__yuv__mmx.c
have been deleted.
I've added:
files/patch-Makefile.in
files/patch-configure
files/patch-sdl-config.in
files/patch-src_joystick_bsd_SDL__sysjoystick.c
>How-To-Repeat:
>Fix:
--- sdl12.diff begins here ---
diff -ruN sdl12.orig/Makefile sdl12/Makefile
--- sdl12.orig/Makefile Sun Jul 9 01:09:27 2006
+++ sdl12/Makefile Sun Jul 9 00:50:31 2006
@@ -6,8 +6,7 @@
#
PORTNAME= sdl
-PORTVERSION= 1.2.9
-PORTREVISION= 2
+PORTVERSION= 1.2.11
PORTEPOCH= 2
CATEGORIES= devel
MASTER_SITES= http://www.libsdl.org/release/
@@ -39,7 +38,9 @@
.endif
OPTIONS= NAS "Include support for the Network Audio System" Off \
- GL "Include support for OpenGL" On
+ GL "Include support for OpenGL" On \
+ DIRFB "Include support for DirectFB" Off \
+ GGI "Include support for GGI" Off
.include <bsd.port.pre.mk>
@@ -58,6 +59,20 @@
CONFIGURE_ARGS+=--disable-nas
.endif
+.if defined(WITH_DIRECTFB)
+LIB_DEPENDS+= directfb-0.9.16:${PORTSDIR}/devel/directfb
+CONFIGURE_ARGS+=--enable-video-directfb
+.else
+CONFIGURE_ARGS+=--disable-video-directfb
+.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
@@ -95,21 +110,9 @@
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:
@${MKDIR} ${EXAMPLESDIR}
${INSTALL_DATA} ${WRKSRC}/test/* ${EXAMPLESDIR}
@@ -121,8 +124,7 @@
${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
.endfor
@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
- @cd ${WRKSRC}/docs; ${TAR} cf - `${ECHO_CMD} [^Mm]*` | \
- (cd ${DOCSDIR}/docs; ${TAR} --unlink -xf - )
+ @cd ${WRKSRC}/docs; ${PAX} -rwl `${ECHO_CMD} [^Mm]*` ${DOCSDIR}/docs
.endif
@${DISPLAY_MSG}
diff -ruN sdl12.orig/distinfo sdl12/distinfo
--- sdl12.orig/distinfo Sun Jul 9 01:09:27 2006
+++ sdl12/distinfo Wed Jul 5 00:42:02 2006
@@ -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) = dbe82ff408bccfd6992b4cf162538595
+SHA256 (SDL-1.2.11.tar.gz) = c3f0e9b016368601697495dcdaed010ab0ee4b541d0052910f829ce318d90a2b
+SIZE (SDL-1.2.11.tar.gz) = 2796143
diff -ruN sdl12.orig/files/patch-Makefile.in sdl12/files/patch-Makefile.in
--- sdl12.orig/files/patch-Makefile.in Thu Jan 1 03:00:00 1970
+++ sdl12/files/patch-Makefile.in Wed Jul 5 01:15:03 2006
@@ -0,0 +1,67 @@
+--- Makefile.in.orig Wed Jul 5 00:58:18 2006
++++ Makefile.in Wed Jul 5 01:06:48 2006
+@@ -30,11 +30,11 @@
+ AR = @AR@
+ RANLIB = @RANLIB@
+
+-TARGET = libSDL.la
++TARGET = libSDL-1.1.la
+ SOURCES = @SOURCES@
+ OBJECTS = @OBJECTS@
+
+-SDLMAIN_TARGET = libSDLmain.a
++SDLMAIN_TARGET = libSDLmain-1.1.a
+ SDLMAIN_SOURCES = @SDLMAIN_SOURCES@
+ SDLMAIN_OBJECTS = @SDLMAIN_OBJECTS@
+
+@@ -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)
+
+@@ -81,14 +81,14 @@
+ install: all install-bin install-hdrs install-lib install-data install-man
+ install-bin:
+ $(SHELL) $(auxdir)/mkinstalldirs $(bindir)
+- $(INSTALL) -m 755 sdl-config $(bindir)/sdl-config
++ $(INSTALL) -m 755 sdl-config $(bindir)/sdl11-config
+ install-hdrs:
+- $(SHELL) $(auxdir)/mkinstalldirs $(includedir)/SDL
++ $(SHELL) $(auxdir)/mkinstalldirs $(includedir)/SDL11
+ for src in $(srcdir)/include/*.h; do \
+ file=`echo $$src | sed -e 's|^.*/||'`; \
+- $(INSTALL) -m 644 $$src $(includedir)/SDL/$$file; \
++ $(INSTALL) -m 644 $$src $(includedir)/SDL11/$$file; \
+ done
+- $(INSTALL) -m 644 include/SDL_config.h $(includedir)/SDL/SDL_config.h
++ $(INSTALL) -m 644 include/SDL_config.h $(includedir)/SDL11/SDL_config.h
+ install-lib:
+ $(SHELL) $(auxdir)/mkinstalldirs $(libdir)
+ $(LIBTOOL) --mode=install $(INSTALL) $(objects)/$(TARGET) $(libdir)/$(TARGET)
+@@ -96,7 +96,7 @@
+ $(RANLIB) $(libdir)/$(SDLMAIN_TARGET)
+ install-data:
+ $(SHELL) $(auxdir)/mkinstalldirs $(datadir)/aclocal
+- $(INSTALL) -m 644 $(srcdir)/sdl.m4 $(datadir)/aclocal/sdl.m4
++ $(INSTALL) -m 644 $(srcdir)/sdl.m4 $(datadir)/aclocal/sdl11.m4
+ $(SHELL) $(auxdir)/mkinstalldirs $(libdir)/pkgconfig
+ $(INSTALL) -m 644 $(srcdir)/sdl.pc $(libdir)/pkgconfig
+ install-man:
+@@ -112,10 +112,10 @@
+ uninstall-hdrs:
+ for src in $(srcdir)/include/*.h; do \
+ file=`echo $$src | sed -e 's|^.*/||'`; \
+- rm -f $(includedir)/SDL/$$file; \
++ rm -f $(includedir)/SDL11/$$file; \
+ done
+- rm -f $(includedir)/SDL/SDL_config.h
+- -rmdir $(includedir)/SDL
++ rm -f $(includedir)/SDL11/SDL_config.h
++ -rmdir $(includedir)/SDL11
+ uninstall-lib:
+ $(LIBTOOL) --mode=uninstall rm -f $(libdir)/$(TARGET)
+ rm -f $(libdir)/$(SDLMAIN_TARGET)
diff -ruN sdl12.orig/files/patch-ac sdl12/files/patch-ac
--- sdl12.orig/files/patch-ac Sun Jul 9 01:09:27 2006
+++ sdl12/files/patch-ac Thu Jan 1 03:00:00 1970
@@ -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 -ruN sdl12.orig/files/patch-ag sdl12/files/patch-ag
--- sdl12.orig/files/patch-ag Sun Jul 9 01:09:27 2006
+++ sdl12/files/patch-ag Thu Jan 1 03:00:00 1970
@@ -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 -ruN sdl12.orig/files/patch-ah sdl12/files/patch-ah
--- sdl12.orig/files/patch-ah Sun Jul 9 01:09:27 2006
+++ sdl12/files/patch-ah Thu Jan 1 03:00:00 1970
@@ -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 at MAINLIB_ARCH_SRCS = dummy/SDL_dummy_main.c
- @TARGET_MACOSX_FALSE@@TARGET_QTOPIA_TRUE@@TARGET_WIN32_FALSE at MAINLIB_ARCH_SRCS = qtopia/SDL_qtopia_main.cc
- @TARGET_MACOSX_TRUE@@TARGET_WIN32_FALSE at 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 -ruN sdl12.orig/files/patch-ai sdl12/files/patch-ai
--- sdl12.orig/files/patch-ai Sun Jul 9 01:09:27 2006
+++ sdl12/files/patch-ai Thu Jan 1 03:00:00 1970
@@ -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 -ruN sdl12.orig/files/patch-aj sdl12/files/patch-aj
--- sdl12.orig/files/patch-aj Sun Jul 9 01:09:27 2006
+++ sdl12/files/patch-aj Thu Jan 1 03:00:00 1970
@@ -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 at 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 -ruN sdl12.orig/files/patch-ak sdl12/files/patch-ak
--- sdl12.orig/files/patch-ak Sun Jul 9 01:09:27 2006
+++ sdl12/files/patch-ak Thu Jan 1 03:00:00 1970
@@ -1,23 +0,0 @@
-
-$FreeBSD: ports/devel/sdl12/files/patch-ak,v 1.6 2003/01/03 08:53:56 sobomax Exp $
-
---- 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 at includedir@/SDL @SDL_CFLAGS@
-+ echo -I at includedir@/SDL11 -I at includedir@ @SDL_CFLAGS@
-
- # The portable way of including SDL is #include "SDL.h"
- #if test @includedir@ != /usr/include ; then
diff -ruN sdl12.orig/files/patch-configure sdl12/files/patch-configure
--- sdl12.orig/files/patch-configure Thu Jan 1 03:00:00 1970
+++ sdl12/files/patch-configure Sun Jul 9 00:59:11 2006
@@ -0,0 +1,31 @@
+--- configure.orig Wed Jul 5 00:52:15 2006
++++ configure Wed Jul 5 01:01:28 2006
+@@ -2915,7 +2915,7 @@
+ # fi
+ #done
+ SDL_CFLAGS="$BASE_CFLAGS"
+-SDL_LIBS="-lSDL $BASE_LDFLAGS"
++SDL_LIBS="-lSDL-1.1 $BASE_LDFLAGS"
+ CPPFLAGS="$CPPFLAGS $EXTRA_CFLAGS"
+ CFLAGS="$CFLAGS $EXTRA_CFLAGS"
+ LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS"
+@@ -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"
+@@ -33188,7 +33190,7 @@
+ SDL_LIBS="$SDL_LIBS -Wl,-framework,Carbon"
+ fi
+ # Evil hack to allow static linking on Mac OS X
+- SDL_STATIC_LIBS="\${exec_prefix}/lib/libSDLmain.a \${exec_prefix}/lib/libSDL.a $EXTRA_LDFLAGS"
++ SDL_STATIC_LIBS="\${exec_prefix}/lib/libSDLmain-1.1.a \${exec_prefix}/lib/libSDL.a $EXTRA_LDFLAGS"
+ ;;
+ *)
+ SDL_STATIC_LIBS="$SDL_LIBS"
diff -ruN sdl12.orig/files/patch-sdl-config.in sdl12/files/patch-sdl-config.in
--- sdl12.orig/files/patch-sdl-config.in Thu Jan 1 03:00:00 1970
+++ sdl12/files/patch-sdl-config.in Wed Jul 5 01:17:31 2006
@@ -0,0 +1,23 @@
+--- sdl-config.in.orig Wed Jul 5 01:16:58 2006
++++ sdl-config.in Wed Jul 5 01:17:16 2006
+@@ -5,9 +5,9 @@
+ exec_prefix_set=no
+
+ @ENABLE_STATIC_FALSE at usage="\
+- at ENABLE_STATIC_FALSE@Usage: sdl-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs]"
++ at ENABLE_STATIC_FALSE@Usage: sdl11-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs]"
+ @ENABLE_STATIC_TRUE at usage="\
+- at ENABLE_STATIC_TRUE@Usage: sdl-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs] [--static-libs]"
++ at ENABLE_STATIC_TRUE@Usage: sdl11-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs] [--static-libs]"
+
+ if test $# -eq 0; then
+ echo "${usage}" 1>&2
+@@ -41,7 +41,7 @@
+ echo @SDL_VERSION@
+ ;;
+ --cflags)
+- echo -I at includedir@/SDL @SDL_CFLAGS@
++ echo -I at includedir@/SDL11 @SDL_CFLAGS@
+ ;;
+ @ENABLE_SHARED_TRUE@ --libs)
+ @ENABLE_SHARED_TRUE@ echo -L at libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@
diff -ruN sdl12.orig/files/patch-src_hermes_HeadMMX.h sdl12/files/patch-src_hermes_HeadMMX.h
--- sdl12.orig/files/patch-src_hermes_HeadMMX.h Sun Jul 9 01:09:27 2006
+++ sdl12/files/patch-src_hermes_HeadMMX.h Thu Jan 1 03:00:00 1970
@@ -1,39 +0,0 @@
-
-$FreeBSD: ports/devel/sdl12/files/patch-src_hermes_HeadMMX.h,v 1.1 2006/03/16 19:55:21 krion Exp $
-
---- 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 -ruN sdl12.orig/files/patch-src_hermes_HeadX86.h sdl12/files/patch-src_hermes_HeadX86.h
--- sdl12.orig/files/patch-src_hermes_HeadX86.h Sun Jul 9 01:09:27 2006
+++ sdl12/files/patch-src_hermes_HeadX86.h Thu Jan 1 03:00:00 1970
@@ -1,96 +0,0 @@
-
-$FreeBSD: ports/devel/sdl12/files/patch-src_hermes_HeadX86.h,v 1.1 2006/03/16 19:55:21 krion Exp $
-
---- 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 -ruN sdl12.orig/files/patch-src_joystick_bsd_SDL__sysjoystick.c sdl12/files/patch-src_joystick_bsd_SDL__sysjoystick.c
--- sdl12.orig/files/patch-src_joystick_bsd_SDL__sysjoystick.c Sun Jul 9 01:09:27 2006
+++ sdl12/files/patch-src_joystick_bsd_SDL__sysjoystick.c Wed Jul 5 01:12:32 2006
@@ -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 -ruN sdl12.orig/files/patch-src_video_SDL__yuv__mmx.c sdl12/files/patch-src_video_SDL__yuv__mmx.c
--- sdl12.orig/files/patch-src_video_SDL__yuv__mmx.c Sun Jul 9 01:09:27 2006
+++ sdl12/files/patch-src_video_SDL__yuv__mmx.c Thu Jan 1 03:00:00 1970
@@ -1,324 +0,0 @@
-
-$FreeBSD: ports/devel/sdl12/files/patch-src_video_SDL__yuv__mmx.c,v 1.4 2006/03/16 19:55:21 krion Exp $
-
---- 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 -ruN sdl12.orig/pkg-plist sdl12/pkg-plist
--- sdl12.orig/pkg-plist Sun Jul 9 01:09:27 2006
+++ sdl12/pkg-plist Wed Jul 5 01:31:45 2006
@@ -4,6 +4,14 @@
include/SDL11/SDL_audio.h
include/SDL11/SDL_byteorder.h
include/SDL11/SDL_cdrom.h
+include/SDL11/SDL_config.h
+include/SDL11/SDL_config_amiga.h
+include/SDL11/SDL_config_dreamcast.h
+include/SDL11/SDL_config_macos.h
+include/SDL11/SDL_config_macosx.h
+include/SDL11/SDL_config_minimal.h
+include/SDL11/SDL_config_os2.h
+include/SDL11/SDL_config_win32.h
include/SDL11/SDL_copying.h
include/SDL11/SDL_cpuinfo.h
include/SDL11/SDL_endian.h
@@ -19,8 +27,10 @@
include/SDL11/SDL_mutex.h
include/SDL11/SDL_name.h
include/SDL11/SDL_opengl.h
+include/SDL11/SDL_platform.h
include/SDL11/SDL_quit.h
include/SDL11/SDL_rwops.h
+include/SDL11/SDL_stdinc.h
include/SDL11/SDL_syswm.h
include/SDL11/SDL_thread.h
include/SDL11/SDL_timer.h
@@ -32,11 +42,11 @@
lib/libSDL-1.1.a
lib/libSDL-1.1.la
lib/libSDL-1.1.so
-lib/libSDL-1.1.so.7
+lib/libSDL-1.1.so.11
lib/libSDLmain-1.1.a
+lib/pkgconfig/sdl.pc
share/aclocal/sdl11.m4
%%EXAMPLESDIR%%/COPYING
-%%EXAMPLESDIR%%/Makefile.am
%%EXAMPLESDIR%%/Makefile.in
%%EXAMPLESDIR%%/README
%%EXAMPLESDIR%%/acinclude.m4
@@ -45,10 +55,10 @@
%%EXAMPLESDIR%%/checkkeys.c
%%EXAMPLESDIR%%/configure
%%EXAMPLESDIR%%/configure.in
+%%EXAMPLESDIR%%/gcc-fat.sh
%%EXAMPLESDIR%%/graywin.c
%%EXAMPLESDIR%%/icon.bmp
%%EXAMPLESDIR%%/loopwave.c
-%%EXAMPLESDIR%%/missing
%%EXAMPLESDIR%%/moose.dat
%%EXAMPLESDIR%%/picture.xbm
%%EXAMPLESDIR%%/sail.bmp
@@ -58,28 +68,30 @@
%%EXAMPLESDIR%%/testbitmap.c
%%EXAMPLESDIR%%/testblitspeed.c
%%EXAMPLESDIR%%/testcdrom.c
-%%EXAMPLESDIR%%/testcpuinfo.c
+%%EXAMPLESDIR%%/testcursor.c
%%EXAMPLESDIR%%/testdyngl.c
-%%EXAMPLESDIR%%/testendian.c
%%EXAMPLESDIR%%/testerror.c
+%%EXAMPLESDIR%%/testfile.c
%%EXAMPLESDIR%%/testgamma.c
%%EXAMPLESDIR%%/testgl.c
%%EXAMPLESDIR%%/testhread.c
+%%EXAMPLESDIR%%/testiconv.c
%%EXAMPLESDIR%%/testjoystick.c
%%EXAMPLESDIR%%/testkeys.c
%%EXAMPLESDIR%%/testlock.c
%%EXAMPLESDIR%%/testoverlay.c
%%EXAMPLESDIR%%/testoverlay2.c
%%EXAMPLESDIR%%/testpalette.c
+%%EXAMPLESDIR%%/testplatform.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
+%%EXAMPLESDIR%%/utf8.txt
@dirrm %%EXAMPLESDIR%%
@dirrmtry include/SDL11
--- sdl12.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list