[Midnightbsd-cvs] mports: sdl12/files: Remove old patches.
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Aug 25 00:51:04 EDT 2007
Log Message:
-----------
Remove old patches.
Removed Files:
-------------
mports/devel/sdl12/files:
patch-ac
patch-ag
patch-ah
patch-ai
patch-ak
patch-src_hermes_HeadMMX.h
patch-src_hermes_HeadX86.h
-------------- next part --------------
--- 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 = \
--- 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"
--- devel/sdl12/files/patch-src_hermes_HeadX86.h
+++ /dev/null
@@ -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
- }
--- 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:
--- devel/sdl12/files/patch-ak
+++ /dev/null
@@ -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
--- devel/sdl12/files/patch-src_hermes_HeadMMX.h
+++ /dev/null
@@ -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
- }
--- 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 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)
More information about the Midnightbsd-cvs
mailing list