pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

sdl12-compat: updatetd to version 1.2.68



Module Name:	pkgsrc-wip
Committed By:	Manuel Kuklinski <mk%asdfghasdfgh.de@localhost>
Pushed By:	mk
Date:		Fri Nov 3 07:11:54 2023 +0100
Changeset:	0218080a33a8509ee5efe5949c902099617bfa73

Modified Files:
	sdl12-compat/Makefile
	sdl12-compat/buildlink3.mk
	sdl12-compat/distinfo
Removed Files:
	sdl12-compat/patches/patch-CMakeLists.txt

Log Message:
sdl12-compat: updatetd to version 1.2.68

Tested linking against audio/din to resolve graphic errors (just a black
screen) on Darwin, but no luck - have to contact upstream of
devel/sdl12-compat or audio/din.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=0218080a33a8509ee5efe5949c902099617bfa73

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 sdl12-compat/Makefile                     |  4 ++--
 sdl12-compat/buildlink3.mk                | 30 ++++++++++++++++---------
 sdl12-compat/distinfo                     |  8 +++----
 sdl12-compat/patches/patch-CMakeLists.txt | 37 -------------------------------
 4 files changed, 26 insertions(+), 53 deletions(-)

diffs:
diff --git a/sdl12-compat/Makefile b/sdl12-compat/Makefile
index 91be9dd664..a380c12f36 100644
--- a/sdl12-compat/Makefile
+++ b/sdl12-compat/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.6 2023/05/06 19:09:11 ryoon Exp $
 
-DISTNAME=	sdl12-compat-1.2.52
-PKGREVISION=	3
+DISTNAME=	sdl12-compat-1.2.68
+PKGREVISION=	0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=libsdl-org/}
 GITHUB_TAG=	release-${PKGVERSION_NOREV}
diff --git a/sdl12-compat/buildlink3.mk b/sdl12-compat/buildlink3.mk
index d7a4150d07..8ca470e689 100644
--- a/sdl12-compat/buildlink3.mk
+++ b/sdl12-compat/buildlink3.mk
@@ -1,21 +1,31 @@
-# $NetBSD: buildlink3.mk,v 1.2 2022/04/21 06:56:18 nia Exp $
+# $NetBSD$
+# XXX
+# XXX This file was created automatically using createbuildlink-3.19.
+# XXX After this file has been verified as correct, the comment lines
+# XXX beginning with "XXX" should be removed.  Please do not commit
+# XXX unverified buildlink3.mk files.
 
 BUILDLINK_TREE+=	sdl12-compat
 
 .if !defined(SDL12_COMPAT_BUILDLINK3_MK)
 SDL12_COMPAT_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.sdl12-compat+=	sdl12-compat>=1.2.52
-BUILDLINK_PKGSRCDIR.sdl12-compat?=	../../wip/sdl12-compat
-BUILDLINK_INCDIRS.sdl12-compat+=	include/SDL
-
-.include "../../mk/bsd.fast.prefs.mk"
+# XXX
+# XXX Packages that only install static libraries or headers should
+# XXX include the following line:
+# XXX
+# XXX	BUILDLINK_DEPMETHOD.sdl12-compat?=	build
 
-.if ${OPSYS} != "Darwin"
-.  include "../../graphics/MesaLib/buildlink3.mk"
-.  include "../../graphics/glu/buildlink3.mk"
-.endif
+BUILDLINK_API_DEPENDS.sdl12-compat+=	sdl12-compat>=1.2.52nb3
+BUILDLINK_PKGSRCDIR.sdl12-compat?=	../../wip/sdl12-compat
 
+# XXX
+# XXX Uncomment and keep only the buildlink3 lines below which are directly
+# XXX needed for dependencies to compile, link, and run.  If this package
+# XXX provides a wrappered API or otherwise does not expose the APIs of the
+# XXX buildlink3 lines below to dependencies, remove them.
+# XXX
+#.include "../../devel/SDL2/buildlink3.mk"
 .endif	# SDL12_COMPAT_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-sdl12-compat
diff --git a/sdl12-compat/distinfo b/sdl12-compat/distinfo
index d3f08e5f00..300a2089d4 100644
--- a/sdl12-compat/distinfo
+++ b/sdl12-compat/distinfo
@@ -1,7 +1,7 @@
 $NetBSD: distinfo,v 1.1 2022/04/01 10:43:05 nia Exp $
 
-BLAKE2s (sdl12-compat-1.2.52.tar.gz) = d8abf6a0bfa94472c664208232c654ea358aff157f4c14f8c508b887d7801479
-SHA512 (sdl12-compat-1.2.52.tar.gz) = cd8f34f61ee9c6d0bd635f4c7a6f3cfb6bb570976f3bf843f1e3893b3a86d087a40bdf5f6bb2de16c9534ec42bc846b6ff599ac557c3b088c447e6106e2558f9
-Size (sdl12-compat-1.2.52.tar.gz) = 421046 bytes
-SHA1 (patch-CMakeLists.txt) = de6b2ae057d1d3bc90fd9659eb3bab908fc44224
+BLAKE2s (sdl12-compat-1.2.68.tar.gz) = 793a906f7234217b43da61953d50ff9756d97bb9dcf97218ca158b18d47dc152
+SHA512 (sdl12-compat-1.2.68.tar.gz) = d0e71e75f312402bf075f6553d9fd6493a3db9dd42719bb753287a35e6c40ee37c6092b157ff2384f3055400a3113645595d1269590cd50ea1e0c8f247240858
+Size (sdl12-compat-1.2.68.tar.gz) = 460180 bytes
+SHA1 (patch-CMakeLists.txt) = ed592630dfc4d2adacdfd8fd9fcfd88ce78e1c24
 SHA1 (patch-include_SDL_SDL__config.h) = 96eb020bb246e111d4240f94f68a1f5e49222070
diff --git a/sdl12-compat/patches/patch-CMakeLists.txt b/sdl12-compat/patches/patch-CMakeLists.txt
deleted file mode 100644
index 340c01a8b4..0000000000
--- a/sdl12-compat/patches/patch-CMakeLists.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD$
-
-# Not every unix system has libdl
-# Don't remove ${PREFIX}/lib from -install_name
-
---- CMakeLists.txt.orig	2022-03-03 14:56:56.000000000 +0000
-+++ CMakeLists.txt
-@@ -71,10 +71,9 @@ string(STRIP "${CMAKE_C_FLAGS}" CMAKE_C_
- 
- if(UNIX AND NOT APPLE)
-     set_target_properties(SDL PROPERTIES COMPILE_DEFINITIONS "_REENTRANT")
--    target_link_libraries(SDL PRIVATE dl)
-+    target_link_libraries(SDL PRIVATE ${CMAKE_DL_LIBS})
- endif()
- if(APPLE)
--    set_target_properties(SDL PROPERTIES INSTALL_NAME_DIR "")
-     set_target_properties(SDL PROPERTIES COMPILE_DEFINITIONS "_THREAD_SAFE")
-     set_target_properties(SDL PROPERTIES LINK_FLAGS
-             "-Wl,-compatibility_version,${DYLIB_COMPAT_VERSION} -Wl,-current_version,${DYLIB_CURRENT_VERSION}")
-@@ -254,7 +253,7 @@ if(SDL12DEVEL)
-       set(SDL_CFLAGS "-D_GNU_SOURCE=1 -D_REENTRANT")
-       set(SDL_RLD_FLAGS "")  # !!! FIXME: this forces rpath, which we might want?
-       set(SDL_LIBS "-lSDL")
--      set(SDL_STATIC_LIBS "-ldl")
-+      set(SDL_STATIC_LIBS ${CMAKE_DL_LIBS})
-       if(NOT STATICDEVEL)
-         set(SDL_STATIC_LIBS "")
-       endif()
-@@ -297,7 +296,7 @@ if(STATICDEVEL AND SDL12DEVEL)
-   add_library(SDL-static STATIC ${SDL12COMPAT_SRCS})
-   target_include_directories(SDL-static PRIVATE ${SDL2_INCLUDE_DIRS})
-   set_target_properties(SDL-static PROPERTIES COMPILE_DEFINITIONS "_REENTRANT")
--  target_link_libraries(SDL-static PRIVATE dl)
-+  target_link_libraries(SDL-static PRIVATE ${CMAKE_DL_LIBS})
-   set_target_properties(SDL-static PROPERTIES
-           VERSION "${PROJECT_VERSION}"
-         OUTPUT_NAME "SDL")


Home | Main Index | Thread Index | Old Index