CVS commit: pkgsrc/multimedia/lightspark

["Niclas Rosenvik" <nros%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nros
Date:           Tue Nov 19 20:05:40 UTC 2024

Modified Files:
        pkgsrc/multimedia/lightspark: Makefile distinfo
        pkgsrc/multimedia/lightspark/patches: patch-CMakeLists.txt

Log Message:
multimedia/lightspark: Fix build with newer CMake, use build.mk
Use CMake:s ASM_NASM instead of the with project shipped
ASM-NASM LANG identifier, fixes:
"can't find CMakeASM-NASMLinkerInformation.cmake" .
Convert to use cmake/build.mk instead of USE_CMAKE.


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 pkgsrc/multimedia/lightspark/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/multimedia/lightspark/distinfo
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/multimedia/lightspark/patches/patch-CMakeLists.txt

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

Modified files:

Index: pkgsrc/multimedia/lightspark/Makefile
diff -u pkgsrc/multimedia/lightspark/Makefile:1.44 pkgsrc/multimedia/lightspark/Makefile:1.45
--- pkgsrc/multimedia/lightspark/Makefile:1.44  Thu Nov 14 22:20:59 2024
+++ pkgsrc/multimedia/lightspark/Makefile       Tue Nov 19 20:05:39 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2024/11/14 22:20:59 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2024/11/19 20:05:39 nros Exp $
 
 DISTNAME=      lightspark-0.8.5
 PKGREVISION=   25
@@ -10,7 +10,6 @@ HOMEPAGE=     https://lightspark.github.io/
 COMMENT=       Open source Flash player
 LICENSE=       gnu-lgpl-v3
 
-USE_CMAKE=     yes
 USE_TOOLS+=    pkg-config msgfmt msgmerge
 USE_LANGUAGES= c c++
 
@@ -25,6 +24,8 @@ GCC_REQD+=    4.6
 CONF_FILES+=   ${PREFIX}/share/examples/lightspark/xdg/lightspark.conf \
                ${PKG_SYSCONFDIR}/xdg/lightspark.conf
 
+.include "../../devel/cmake/build.mk"
+
 .include "../../archivers/xz/buildlink3.mk"
 .include "../../audio/SDL2_mixer/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"

Index: pkgsrc/multimedia/lightspark/distinfo
diff -u pkgsrc/multimedia/lightspark/distinfo:1.8 pkgsrc/multimedia/lightspark/distinfo:1.9
--- pkgsrc/multimedia/lightspark/distinfo:1.8   Tue Oct 26 11:01:11 2021
+++ pkgsrc/multimedia/lightspark/distinfo       Tue Nov 19 20:05:39 2024
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.8 2021/10/26 11:01:11 nia Exp $
+$NetBSD: distinfo,v 1.9 2024/11/19 20:05:39 nros Exp $
 
 BLAKE2s (lightspark-0.8.5.tar.gz) = 4dad61856b791bf9bdb7aec592eb9d6b36c09c5eaf5712cac05d32293347f119
 SHA512 (lightspark-0.8.5.tar.gz) = 79e78925f9132b2c6044e4abf326d768c8d45509f85d9123e3dd172b2769772567223676fa7c8ea4d08bc541e9aa7a2b2d5a1062ff9f3a6274234af8798ee11b
 Size (lightspark-0.8.5.tar.gz) = 2490510 bytes
-SHA1 (patch-CMakeLists.txt) = 0303a8e4af91b6db2faf4a9eb6ff98d90368e2c5
+SHA1 (patch-CMakeLists.txt) = 2205972d0b09015fe11f7eb8670744d4b712b7ea
 SHA1 (patch-src_3rdparty_jxrlib_image_decode_segdec.c) = e263288ede1f11a780d438c0be836b0f33fef80e
 SHA1 (patch-src_backends_urlutils.cpp) = bd1e7584703a1045609b13b7379cf3eddcd13ef0
 SHA1 (patch-src_parsing_tags.cpp) = 951f2757ed68f6e0f5964df3fa944aeace4cbda3

Index: pkgsrc/multimedia/lightspark/patches/patch-CMakeLists.txt
diff -u pkgsrc/multimedia/lightspark/patches/patch-CMakeLists.txt:1.3 pkgsrc/multimedia/lightspark/patches/patch-CMakeLists.txt:1.4
--- pkgsrc/multimedia/lightspark/patches/patch-CMakeLists.txt:1.3       Thu Dec  3 22:23:33 2020
+++ pkgsrc/multimedia/lightspark/patches/patch-CMakeLists.txt   Tue Nov 19 20:05:40 2024
@@ -1,26 +1,56 @@
-$NetBSD: patch-CMakeLists.txt,v 1.3 2020/12/03 22:23:33 nia Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.4 2024/11/19 20:05:40 nros Exp $
 
-Hunk 1:
+Hunk 1 and 2:
+Use CMake:s ASM_NASM instead of the with project shipped
+ASM-NASM LANG identifier, fixes:
+"can't find CMakeASM-NASMLinkerInformation.cmake"
+
+Hunk 3:
 
 Use /lib for "private libs" (liblightspark). This may be evil,
 but currently the private rpath isn't being added properly.
 
-Hunk 2:
+Hunk 4:
 
 Install config file as example.
 
---- CMakeLists.txt.orig        2020-07-05 10:31:09.000000000 +0000
+--- CMakeLists.txt.orig        2021-07-03 15:33:45.000000000 +0000
 +++ CMakeLists.txt
-@@ -112,7 +112,7 @@ IF(CMAKE_SIZEOF_VOID_P STREQUAL "8")
-     ADD_DEFINITIONS(-DLIGHTSPARK_64)
- endif(CMAKE_SIZEOF_VOID_P STREQUAL "8")
- # Some directory shortcuts
--SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/conf)
-+SET (CMAKE_MODULE_PATH "/home/nia/cvs/pkgsrc/multimedia/lightspark/work/.buildlink/cmake-Modules" ${PROJECT_SOURCE_DIR}/conf)
+@@ -116,15 +116,12 @@ SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_D
  INCLUDE(Pack)
  # If we're gcc, then use nasm to get fastpath.  If MSVC, just use inline asm to get around
  # CMake issues 
-@@ -173,10 +173,10 @@ IF(UNIX)
+-IF(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+-   INCLUDE(CMakeASM-NASMCompiler)
+-ENDIF(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+ IF(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^i[3-6]86$|^x86$")
+       SET(i386 1)
+       SET(LIB_SUFFIX "" CACHE STRING "Choose the suffix of the lib folder (if any) : None 32")
+       # nasm for assembly optimizations
+       IF(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+-         ENABLE_LANGUAGE(ASM-NASM)        
++         ENABLE_LANGUAGE(ASM_NASM)        
+       ENDIF(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+ ELSEIF(${CMAKE_SYSTEM_PROCESSOR} MATCHES "unknown" AND ${CMAKE_SYSTEM} MATCHES "GNU-0.3")
+       # GNU Hurd is i386
+@@ -132,14 +129,14 @@ ELSEIF(${CMAKE_SYSTEM_PROCESSOR} MATCHES
+       SET(LIB_SUFFIX "" CACHE STRING "Choose the suffix of the lib folder (if any) : None 32")
+       # nasm for assembly optimizations
+       IF(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+-         ENABLE_LANGUAGE(ASM-NASM)
++         ENABLE_LANGUAGE(ASM_NASM)
+       ENDIF ()
+ ELSEIF(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^x86_64$|^amd64$")
+       SET(x86_64 1)
+       SET(LIB_SUFFIX "" CACHE STRING "Choose the suffix of the lib folder (if any) : None 64")
+       # nasm for assembly optimizations
+       IF(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+-        ENABLE_LANGUAGE(ASM-NASM)
++        ENABLE_LANGUAGE(ASM_NASM)
+       ENDIF(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+ ELSEIF(${CMAKE_SYSTEM_PROCESSOR} MATCHES "ppc")
+       SET(ppc 1)
+@@ -173,10 +170,10 @@ IF(UNIX)
     SET(DATADIR "share")
     # Absolute path, because this path is embedded in the binary
     SET(LSDATADIR "${CMAKE_INSTALL_PREFIX}/${DATADIR}/lightspark")
@@ -33,7 +63,7 @@ Install config file as example.
     SET(CMAKE_INSTALL_RPATH "${PRIVATELIBDIR}")
  ELSE()
    SET(ETCDIR ".")
-@@ -552,7 +552,7 @@ GETTEXT_CREATE_TRANSLATIONS(i18n/lightsp
+@@ -539,7 +536,7 @@ GETTEXT_CREATE_TRANSLATIONS(i18n/lightsp
  
  if(UNIX)
        INSTALL(FILES etc/xdg/lightspark.conf