@pheem49/mint 1.8.0 → 1.8.2

package/shared-modules/SDL/libsdl-1.2.15-strict-prototypes.patch

@@ -0,0 +1,316 @@
+https://github.com/libsdl-org/SDL-1.2/pull/869
+https://github.com/libsdl-org/SDL-1.2/commit/ff3516b9ddbb4f8a87d9c3546c0a4fb6eb491cfe
+https://github.com/libsdl-org/SDL-1.2/commit/e738cfffced8a006094d55337d917386582ada47
+
+From ff3516b9ddbb4f8a87d9c3546c0a4fb6eb491cfe Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Sat, 15 Oct 2022 14:35:38 -0700
+Subject: [PATCH 1/2] Xxf86vm: Fix function definitions without a prototype
+
+This is not supported with the upcoming clang 16.
+
+error: a function definition without a prototype is deprecated in all versions of C and is not supported in C2x [-Werror,-Wdeprecated-non-prototype]
+
+reference: https://archives.gentoo.org/gentoo-dev/message/dd9f2d3082b8b6f8dfbccb0639e6e240
+---
+ src/video/Xext/Xxf86vm/XF86VMode.c | 128 +++++++++++++++--------------
+ 1 file changed, 65 insertions(+), 63 deletions(-)
+
+diff --git a/src/video/Xext/Xxf86vm/XF86VMode.c b/src/video/Xext/Xxf86vm/XF86VMode.c
+index 5cb21905a..c3bd26716 100644
+--- a/src/video/Xext/Xxf86vm/XF86VMode.c
++++ b/src/video/Xext/Xxf86vm/XF86VMode.c
+@@ -102,9 +102,11 @@ static XEXT_GENERATE_CLOSE_DISPLAY (close_display, xf86vidmode_info)
+  *****************************************************************************/
+ 
+ Bool
+-SDL_NAME(XF86VidModeQueryExtension) (dpy, event_basep, error_basep)
+-    Display *dpy;
+-    int *event_basep, *error_basep;
++SDL_NAME(XF86VidModeQueryExtension)(
++    Display *dpy,
++    int *event_basep,
++    int *error_basep
++)
+ {
+     XExtDisplayInfo *info = find_display (dpy);
+ 
+@@ -118,10 +120,11 @@ SDL_NAME(XF86VidModeQueryExtension) (dpy, event_basep, error_basep)
+ }
+ 
+ Bool
+-SDL_NAME(XF86VidModeQueryVersion)(dpy, majorVersion, minorVersion)
+-    Display* dpy;
+-    int* majorVersion; 
+-    int* minorVersion;
++SDL_NAME(XF86VidModeQueryVersion)(
++    Display *dpy,
++    int *majorVersion,
++    int *minorVersion
++)
+ {
+     XExtDisplayInfo *info = find_display (dpy);
+     xXF86VidModeQueryVersionReply rep;
+@@ -215,11 +218,12 @@ SDL_NAME(XF86VidModeGetGamma)(Display *dpy, int screen, SDL_NAME(XF86VidModeGamm
+ }
+ 
+ Bool
+-SDL_NAME(XF86VidModeGetModeLine)(dpy, screen, dotclock, modeline)
+-    Display* dpy;
+-    int screen;
+-    int* dotclock; 
+-    SDL_NAME(XF86VidModeModeLine)* modeline;
++SDL_NAME(XF86VidModeGetModeLine)(
++    Display *dpy,
++    int screen,
++    int *dotclock,
++    SDL_NAME(XF86VidModeModeLine) *modeline
++)
+ {
+     XExtDisplayInfo *info = find_display (dpy);
+     xXF86VidModeGetModeLineReply rep;
+@@ -292,11 +296,12 @@ SDL_NAME(XF86VidModeGetModeLine)(dpy, screen, dotclock, modeline)
+ }
+ 
+ Bool
+-SDL_NAME(XF86VidModeGetAllModeLines)(dpy, screen, modecount, modelinesPtr)
+-    Display* dpy;
+-    int screen;
+-    int* modecount; 
+-    SDL_NAME(XF86VidModeModeInfo) ***modelinesPtr;
++SDL_NAME(XF86VidModeGetAllModeLines)(
++    Display *dpy,
++    int screen,
++    int *modecount,
++    SDL_NAME(XF86VidModeModeInfo) ***modelinesPtr
++)
+ {
+     XExtDisplayInfo *info = find_display (dpy);
+     xXF86VidModeGetAllModeLinesReply rep;
+@@ -456,11 +461,12 @@ SDL_NAME(XF86VidModeGetAllModeLines)(dpy, screen, modecount, modelinesPtr)
+ #endif
+ 
+ Bool
+-SDL_NAME(XF86VidModeAddModeLine) (dpy, screen, newmodeline, aftermodeline)
+-    Display *dpy;
+-    int screen;
+-    SDL_NAME(XF86VidModeModeInfo)* newmodeline;
+-    SDL_NAME(XF86VidModeModeInfo)* aftermodeline;
++SDL_NAME(XF86VidModeAddModeLine)(
++    Display *dpy,
++    int screen,
++    SDL_NAME(XF86VidModeModeInfo) *newmodeline,
++    SDL_NAME(XF86VidModeModeInfo) *aftermodeline
++)
+ {
+     XExtDisplayInfo *info = find_display (dpy);
+     xXF86VidModeAddModeLineReq *req;
+@@ -569,10 +575,11 @@ SDL_NAME(XF86VidModeAddModeLine) (dpy, screen, newmodeline, aftermodeline)
+ }
+ 
+ Bool
+-SDL_NAME(XF86VidModeDeleteModeLine) (dpy, screen, modeline)
+-    Display *dpy;
+-    int screen;
+-    SDL_NAME(XF86VidModeModeInfo)* modeline;
++SDL_NAME(XF86VidModeDeleteModeLine)(
++    Display *dpy,
++    int screen,
++    SDL_NAME(XF86VidModeModeInfo) *modeline
++)
+ {
+     XExtDisplayInfo *info = find_display (dpy);
+     xXF86VidModeDeleteModeLineReq *req;
+@@ -633,10 +640,11 @@ SDL_NAME(XF86VidModeDeleteModeLine) (dpy, screen, modeline)
+ }
+ 
+ Bool
+-SDL_NAME(XF86VidModeModModeLine) (dpy, screen, modeline)
+-    Display *dpy;
+-    int screen;
+-    SDL_NAME(XF86VidModeModeLine)* modeline;
++SDL_NAME(XF86VidModeModModeLine)(
++    Display *dpy,
++    int screen,
++    SDL_NAME(XF86VidModeModeLine) *modeline
++)
+ {
+     XExtDisplayInfo *info = find_display (dpy);
+     xXF86VidModeModModeLineReq *req;
+@@ -695,10 +703,11 @@ SDL_NAME(XF86VidModeModModeLine) (dpy, screen, modeline)
+ }
+ 
+ Status
+-SDL_NAME(XF86VidModeValidateModeLine) (dpy, screen, modeline)
+-    Display *dpy;
+-    int screen;
+-    SDL_NAME(XF86VidModeModeInfo)* modeline;
++SDL_NAME(XF86VidModeValidateModeLine)(
++    Display *dpy,
++    int screen,
++    SDL_NAME(XF86VidModeModeInfo) *modeline
++)
+ {
+     XExtDisplayInfo *info = find_display (dpy);
+     xXF86VidModeValidateModeLineReq *req;
+@@ -766,10 +775,7 @@ SDL_NAME(XF86VidModeValidateModeLine) (dpy, screen, modeline)
+ }
+ 
+ Bool
+-SDL_NAME(XF86VidModeSwitchMode)(dpy, screen, zoom)
+-    Display* dpy;
+-    int screen;
+-    int zoom;
++SDL_NAME(XF86VidModeSwitchMode)(Display *dpy, int screen, int zoom)
+ {
+     XExtDisplayInfo *info = find_display (dpy);
+     xXF86VidModeSwitchModeReq *req;
+@@ -788,10 +794,11 @@ SDL_NAME(XF86VidModeSwitchMode)(dpy, screen, zoom)
+ }
+     
+ Bool
+-SDL_NAME(XF86VidModeSwitchToMode)(dpy, screen, modeline)
+-    Display* dpy;
+-    int screen;
+-    SDL_NAME(XF86VidModeModeInfo)* modeline;
++SDL_NAME(XF86VidModeSwitchToMode)(
++    Display *dpy,
++    int screen,
++    SDL_NAME(XF86VidModeModeInfo) *modeline
++)
+ {
+     XExtDisplayInfo *info = find_display (dpy);
+     xXF86VidModeSwitchToModeReq *req;
+@@ -877,10 +884,7 @@ SDL_NAME(XF86VidModeSwitchToMode)(dpy, screen, modeline)
+ }
+     
+ Bool
+-SDL_NAME(XF86VidModeLockModeSwitch)(dpy, screen, lock)
+-    Display* dpy;
+-    int screen;
+-    int lock;
++SDL_NAME(XF86VidModeLockModeSwitch)(Display *dpy, int screen, int lock)
+ {
+     XExtDisplayInfo *info = find_display (dpy);
+     xXF86VidModeLockModeSwitchReq *req;
+@@ -899,10 +903,11 @@ SDL_NAME(XF86VidModeLockModeSwitch)(dpy, screen, lock)
+ }
+     
+ Bool
+-SDL_NAME(XF86VidModeGetMonitor)(dpy, screen, monitor)
+-    Display* dpy;
+-    int screen;
+-    SDL_NAME(XF86VidModeMonitor)* monitor;
++SDL_NAME(XF86VidModeGetMonitor)(
++    Display *dpy,
++    int screen,
++    SDL_NAME(XF86VidModeMonitor) *monitor
++)
+ {
+     XExtDisplayInfo *info = find_display (dpy);
+     xXF86VidModeGetMonitorReply rep;
+@@ -1000,10 +1005,7 @@ SDL_NAME(XF86VidModeGetMonitor)(dpy, screen, monitor)
+ }
+ 
+ Bool
+-SDL_NAME(XF86VidModeGetViewPort)(dpy, screen, x, y)
+-    Display* dpy;
+-    int screen;
+-    int *x, *y;
++SDL_NAME(XF86VidModeGetViewPort)(Display *dpy, int screen, int *x, int *y)
+ {
+     XExtDisplayInfo *info = find_display (dpy);
+     xXF86VidModeGetViewPortReply rep;
+@@ -1053,10 +1055,7 @@ SDL_NAME(XF86VidModeGetViewPort)(dpy, screen, x, y)
+ }
+ 
+ Bool
+-SDL_NAME(XF86VidModeSetViewPort)(dpy, screen, x, y)
+-    Display* dpy;
+-    int screen;
+-    int x, y;
++SDL_NAME(XF86VidModeSetViewPort)(Display *dpy, int screen, int x, int y)
+ {
+     XExtDisplayInfo *info = find_display (dpy);
+     xXF86VidModeSetViewPortReq *req;
+@@ -1077,11 +1076,14 @@ SDL_NAME(XF86VidModeSetViewPort)(dpy, screen, x, y)
+ }
+ 
+ Bool
+-SDL_NAME(XF86VidModeGetDotClocks)(dpy, screen,
+-	    flagsPtr, numclocksPtr, maxclocksPtr, clocksPtr)
+-    Display* dpy;
+-    int screen;
+-    int *flagsPtr, *numclocksPtr, *maxclocksPtr, *clocksPtr[]; 
++SDL_NAME(XF86VidModeGetDotClocks)(
++    Display *dpy,
++    int screen,
++    int *flagsPtr,
++    int *numclocksPtr,
++    int *maxclocksPtr,
++    int *clocksPtr[]
++)
+ {
+     XExtDisplayInfo *info = find_display (dpy);
+     xXF86VidModeGetDotClocksReply rep;
+
+From e738cfffced8a006094d55337d917386582ada47 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Sat, 15 Oct 2022 15:10:48 -0700
+Subject: [PATCH 2/2] Xext: Fix function declarations without a prototype
+
+This is not supported with the upcoming clang 16.
+
+error: a function declaration without a prototype is deprecated in all versions of C and is treated as a zero-parameter prototype in C2x, conflicting with a subsequent definition [-Werror,-Wdeprecated-non-prototype]
+
+reference: https://archives.gentoo.org/gentoo-dev/message/dd9f2d3082b8b6f8dfbccb0639e6e240
+---
+ src/video/Xext/XME/xme.c           | 2 +-
+ src/video/Xext/Xinerama/Xinerama.c | 3 ++-
+ src/video/Xext/Xv/Xv.c             | 6 +++---
+ 3 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/src/video/Xext/XME/xme.c b/src/video/Xext/XME/xme.c
+index 2cead35ad..bb8d04d48 100644
+--- a/src/video/Xext/XME/xme.c
++++ b/src/video/Xext/XME/xme.c
+@@ -206,7 +206,7 @@ static char *xigmisc_extension_name = XIGMISC_PROTOCOL_NAME;
+ /*
+  * find_display - locate the display info block
+  */
+-static int XiGMiscCloseDisplay();
++static int XiGMiscCloseDisplay(Display*, XExtCodes*);
+ 
+ static XExtensionHooks xigmisc_extension_hooks = {
+     NULL,                               /* create_gc */
+diff --git a/src/video/Xext/Xinerama/Xinerama.c b/src/video/Xext/Xinerama/Xinerama.c
+index 4ff42ebfe..57f64b9c3 100644
+--- a/src/video/Xext/Xinerama/Xinerama.c
++++ b/src/video/Xext/Xinerama/Xinerama.c
+@@ -50,7 +50,8 @@ static /* const */ char *panoramiX_extension_name = PANORAMIX_PROTOCOL_NAME;
+ #define PanoramiXSimpleCheckExtension(dpy,i) \
+   XextSimpleCheckExtension (dpy, i, panoramiX_extension_name)
+ 
+-static int close_display();
++static int close_display(Display*, XExtCodes*);
++
+ static /* const */ XExtensionHooks panoramiX_extension_hooks = {
+     NULL,				/* create_gc */
+     NULL,				/* copy_gc */
+diff --git a/src/video/Xext/Xv/Xv.c b/src/video/Xext/Xv/Xv.c
+index 7147b9e8c..c254a1dc2 100644
+--- a/src/video/Xext/Xv/Xv.c
++++ b/src/video/Xext/Xv/Xv.c
+@@ -63,9 +63,9 @@ static char *xv_extension_name = XvName;
+ #define XvCheckExtension(dpy, i, val) \
+   XextCheckExtension(dpy, i, xv_extension_name, val)
+ 
+-static char *xv_error_string();
+-static int xv_close_display();
+-static Bool xv_wire_to_event();
++static char *xv_error_string(Display*, int, XExtCodes*, char*, int);
++static int xv_close_display(Display*, XExtCodes*);
++static Bool xv_wire_to_event(Display*, XEvent*, xEvent*);
+ 
+ static XExtensionHooks xv_extension_hooks = {
+     NULL,                               /* create_gc */

package/shared-modules/SDL/sdl-check-for-SDL_VIDEO_X11_BACKINGSTORE.patch

@@ -0,0 +1,24 @@
+Description: Do not harness backing store by default
+ xorg-server 1.15 enables backing store if composite extension is enabled
+ (default settings). Harnessing backing store through compositor leads to
+ tearing effect.
+ This patch reverts default harnessing backing store to conditional use if
+ SDL_VIDEO_X11_BACKINGSTORE environment variable exists.
+Origin: https://bugs.launchpad.net/ubuntu/+source/libsdl1.2/+bug/1280665/comments/1
+Bug: https://bugzilla.libsdl.org/show_bug.cgi?id=2383
+Bug-Debian: https://bugs.debian.org/747168
+
+--- a/src/video/x11/SDL_x11video.c
++++ b/src/video/x11/SDL_x11video.c
+@@ -1088,10 +1088,8 @@
+ 		}
+ 	}
+ 
+-#if 0 /* This is an experiment - are the graphics faster now? - nope. */
+ 	if ( SDL_getenv("SDL_VIDEO_X11_BACKINGSTORE") )
+-#endif
+-	/* Cache the window in the server, when possible */
++	/* Cache the window in the server when possible, on request */
+ 	{
+ 		Screen *xscreen;
+ 		XSetWindowAttributes a;

package/shared-modules/SDL/sdl-libx11-build.patch

@@ -0,0 +1,59 @@
+
+# HG changeset patch
+# User Azamat H. Hackimov <azamat.hackimov@gmail.com>
+# Date 1370184533 -21600
+# Node ID 91ad7b43317a6387e115ecdf63a49137f47e42c8
+# Parent  f7fd5c3951b9ed922fdf696f7182e71b58a13268
+Fix compilation with libX11 >= 1.5.99.902.
+
+These changes fixes bug #1769 for SDL 1.2
+(http://bugzilla.libsdl.org/show_bug.cgi?id=1769).
+
+diff -r f7fd5c3951b9 -r 91ad7b43317a configure.in
+--- a/configure.in	Wed Apr 17 00:56:53 2013 -0700
++++ b/configure.in	Sun Jun 02 20:48:53 2013 +0600
+@@ -1169,6 +1169,17 @@
+             if test x$definitely_enable_video_x11_xrandr = xyes; then
+                 AC_DEFINE(SDL_VIDEO_DRIVER_X11_XRANDR)
+             fi
++            AC_MSG_CHECKING(for const parameter to _XData32)
++            have_const_param_xdata32=no
++            AC_TRY_COMPILE([
++              #include <X11/Xlibint.h>
++              extern int _XData32(Display *dpy,register _Xconst long *data,unsigned len);
++            ],[
++            ],[
++            have_const_param_xdata32=yes
++            AC_DEFINE(SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32)
++            ])
++            AC_MSG_RESULT($have_const_param_xdata32)
+         fi
+     fi
+ }
+diff -r f7fd5c3951b9 -r 91ad7b43317a include/SDL_config.h.in
+--- a/include/SDL_config.h.in	Wed Apr 17 00:56:53 2013 -0700
++++ b/include/SDL_config.h.in	Sun Jun 02 20:48:53 2013 +0600
+@@ -283,6 +283,7 @@
+ #undef SDL_VIDEO_DRIVER_WINDIB
+ #undef SDL_VIDEO_DRIVER_WSCONS
+ #undef SDL_VIDEO_DRIVER_X11
++#undef SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32
+ #undef SDL_VIDEO_DRIVER_X11_DGAMOUSE
+ #undef SDL_VIDEO_DRIVER_X11_DYNAMIC
+ #undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT
+diff -r f7fd5c3951b9 -r 91ad7b43317a src/video/x11/SDL_x11sym.h
+--- a/src/video/x11/SDL_x11sym.h	Wed Apr 17 00:56:53 2013 -0700
++++ b/src/video/x11/SDL_x11sym.h	Sun Jun 02 20:48:53 2013 +0600
+@@ -165,7 +165,11 @@
+  */
+ #ifdef LONG64
+ SDL_X11_MODULE(IO_32BIT)
++#if SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32
++SDL_X11_SYM(int,_XData32,(Display *dpy,register _Xconst long *data,unsigned len),(dpy,data,len),return)
++#else
+ SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return)
++#endif
+ SDL_X11_SYM(void,_XRead32,(Display *dpy,register long *data,long len),(dpy,data,len),)
+ #endif
+ 
+

package/shared-modules/SDL/sdl-sysloadso-buffer-length.patch

@@ -0,0 +1,27 @@
+Origin: https://github.com/libsdl-org/SDL-1.2/commit/447ec3d2c360902aa648bec44b612a040248871e
+From: Ozkan Sezer <sezeroz@gmail.com>
+Description: loadso, dlsym, SDL_LoadFunction: cleanup the underscored name path.
+ - strlcpy was passed a wrong buffer length parameter. has worked so
+   far by luck.
+ - use memcpy instead of strlcpy for simplicity.
+ - 'append' has been a typo: should be 'prepend'.
+diff --git a/src/loadso/dlopen/SDL_sysloadso.c b/src/loadso/dlopen/SDL_sysloadso.c
+index 7985ee7f9..56331a1f0 100644
+--- a/src/loadso/dlopen/SDL_sysloadso.c
++++ b/src/loadso/dlopen/SDL_sysloadso.c
+@@ -45,11 +45,11 @@ void *SDL_LoadFunction(void *handle, const char *name)
+ {
+ 	void *symbol = dlsym(handle, name);
+ 	if ( symbol == NULL ) {
+-		/* append an underscore for platforms that need that. */
+-		size_t len = 1+SDL_strlen(name)+1;
+-		char *_name = SDL_stack_alloc(char, len);
++		/* prepend an underscore for platforms that need that. */
++		size_t len = SDL_strlen(name)+1;
++		char *_name = SDL_stack_alloc(char, len+1);
+ 		_name[0] = '_';
+-		SDL_strlcpy(&_name[1], name, len);
++		SDL_memcpy(&_name[1], name, len);
+ 		symbol = dlsym(handle, _name);
+ 		SDL_stack_free(_name);
+ 		if ( symbol == NULL ) {

package/shared-modules/SDL/sdl12-compat.json

@@ -0,0 +1,22 @@
+{
+    "name": "sdl12-compat",
+    "buildsystem": "cmake-ninja",
+    "builddir": true,
+    "cleanup": [
+        "/bin/sdl-config",
+        "/include",
+        "/lib/pkgconfig",
+        "/share/aclocal",
+        "*.a"
+    ],
+    "sources": [
+        {
+            "type": "archive",
+            "url": "https://github.com/libsdl-org/sdl12-compat/releases/download/release-1.2.74/sdl12-compat-1.2.74.tar.gz",
+            "sha256": "86b6cb20387209eb487273834c41424a42c56637635ca6c58722e1031b04bee0"
+        }
+    ],
+    "modules": [
+        "../glu/glu-9.json"
+    ]
+}

package/shared-modules/SDL2/SDL2_image.json

@@ -0,0 +1,27 @@
+{
+    "name": "SDL2_image",
+    "config-opts": [
+        "-DSDL2IMAGE_DEPS_SHARED=OFF",
+        "-DSDL2IMAGE_STRICT=ON"
+    ],
+    "cleanup": [
+        "/include",
+        "/lib/cmake",
+        "/lib/pkgconfig"
+    ],
+    "buildsystem": "cmake-ninja",
+    "builddir": true,
+    "sources": [
+        {
+            "type": "archive",
+            "url": "https://github.com/libsdl-org/SDL_image/releases/download/release-2.8.12/SDL2_image-2.8.12.tar.gz",
+            "sha256": "393f5efb50536ec13ca4f4affb69cc9966d3c3f969e6c5e701faddf9f9785381",
+            "x-checker-data": {
+                "type": "anitya",
+                "project-id": 382729,
+                "stable-only": true,
+                "url-template": "https://github.com/libsdl-org/SDL_image/releases/download/release-$version/SDL2_image-$version.tar.gz"
+            }
+        }
+    ]
+}

package/shared-modules/SDL2/SDL2_ttf.json

@@ -0,0 +1,29 @@
+{
+    "name": "SDL2_ttf",
+    "config-opts": [
+        "-DSDL2TTF_HARFBUZZ=ON"
+    ],
+    "cleanup": [
+        "/include",
+        "/lib/cmake",
+        "/lib/pkgconfig"
+    ],
+    "buildsystem": "cmake-ninja",
+    "builddir": true,
+    "sources": [
+        {
+            "type": "archive",
+            "url": "https://github.com/libsdl-org/SDL_ttf/releases/download/release-2.24.0/SDL2_ttf-2.24.0.tar.gz",
+            "sha256": "0b2bf1e7b6568adbdbc9bb924643f79d9dedafe061fa1ed687d1d9ac4e453bfd",
+            "x-checker-data": {
+                "type": "anitya",
+                "project-id": 4784,
+                "stable-only": true,
+                "versions": {
+                    "<": "3.0.0"
+                },
+                "url-template": "https://github.com/libsdl-org/SDL_ttf/releases/download/release-$version/SDL2_ttf-$version.tar.gz"
+            }
+        }
+    ]
+}

package/shared-modules/cld2/CMakeLists.txt

@@ -0,0 +1,157 @@
+cmake_minimum_required(VERSION 2.8)
+project (cld2)
+enable_language(CXX)
+
+include(GNUInstallDirs)
+
+set (VERSION "0.0.197")
+set (common_SOURCE_FILES
+    internal/cldutil.cc
+    internal/cldutil_shared.cc
+    internal/compact_lang_det.cc
+    internal/compact_lang_det_hint_code.cc
+    internal/compact_lang_det_impl.cc
+    internal/debug.cc
+    internal/fixunicodevalue.cc
+    internal/generated_entities.cc
+    internal/generated_language.cc
+    internal/generated_ulscript.cc
+    internal/getonescriptspan.cc
+    internal/lang_script.cc
+    internal/offsetmap.cc
+    internal/scoreonescriptspan.cc
+    internal/tote.cc
+    internal/utf8statetable.cc
+    )
+
+set (cld2_SOURCE_FILES
+    internal/generated_distinct_bi_0.cc
+    internal/cld_generated_cjk_uni_prop_80.cc
+    internal/cld2_generated_cjk_compatible.cc
+    internal/cld_generated_cjk_delta_bi_4.cc
+    internal/cld2_generated_quadchrome_2.cc
+    internal/cld2_generated_deltaoctachrome.cc
+    internal/cld2_generated_distinctoctachrome.cc
+    internal/cld_generated_score_quad_octa_2.cc
+    )
+
+set (cld2_full_SOURCE_FILES
+    internal/generated_distinct_bi_0.cc
+    internal/cld_generated_cjk_uni_prop_80.cc
+    internal/cld2_generated_cjk_compatible.cc
+    internal/cld_generated_cjk_delta_bi_32.cc
+    internal/cld2_generated_quad0122.cc
+    internal/cld2_generated_deltaocta0122.cc
+    internal/cld2_generated_distinctocta0122.cc
+    internal/cld_generated_score_quad_octa_0122.cc
+    )
+
+set (cld2_dynamic_SOURCE_FILES
+    internal/cld2_dynamic_data.cc
+    internal/cld2_dynamic_data_loader.cc
+    )
+
+add_library(cld2 SHARED ${common_SOURCE_FILES} ${cld2_SOURCE_FILES})
+set_target_properties(cld2 PROPERTIES
+  ENABLE_EXPORTS On
+  OUTPUT_NAME cld2
+  VERSION ${VERSION}
+  SOVERSION 0
+  )
+add_library(cld2_full SHARED ${cld2_full_SOURCE_FILES})
+set_target_properties(cld2_full PROPERTIES
+  ENABLE_EXPORTS On
+  OUTPUT_NAME cld2_full
+  VERSION ${VERSION}
+  SOVERSION 0
+  )
+
+add_library(cld2_dynamic SHARED ${cld2_dynamic_SOURCE_FILES})
+set_target_properties(cld2_dynamic PROPERTIES
+  ENABLE_EXPORTS On
+  OUTPUT_NAME cld2_dynamic
+  VERSION ${VERSION}
+  SOVERSION 0
+  COMPILE_FLAGS "-DCLD2_DYNAMIC_MODE"
+  )
+install(TARGETS cld2 LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+install(TARGETS cld2_full LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+install(TARGETS cld2_dynamic LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+
+set (cld2_internal_HEADERS
+    internal/cld2_dynamic_compat.h
+    internal/cld2_dynamic_data_extractor.h
+    internal/cld2_dynamic_data.h
+    internal/cld2_dynamic_data_loader.h
+    internal/cld2tablesummary.h
+    internal/cldutil.h
+    internal/cldutil_offline.h
+    internal/cldutil_shared.h
+    internal/compact_lang_det_hint_code.h
+    internal/compact_lang_det_impl.h
+    internal/debug.h
+    internal/fixunicodevalue.h
+    internal/generated_language.h
+    internal/generated_ulscript.h
+    internal/getonescriptspan.h
+    internal/integral_types.h
+    internal/lang_script.h
+    internal/langspan.h
+    internal/offsetmap.h
+    internal/port.h
+    internal/scoreonescriptspan.h
+    internal/stringpiece.h
+    internal/tote.h
+    internal/unittest_data.h
+    internal/utf8acceptinterchange.h
+    internal/utf8prop_lettermarkscriptnum.h
+    internal/utf8repl_lettermarklower.h
+    internal/utf8scannot_lettermarkspecial.h
+    internal/utf8statetable.h
+    )
+
+install(FILES ${cld2_internal_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/cld2/internal)
+set (cld2_public_HEADERS
+    public/compact_lang_det.h
+    public/encodings.h
+    )
+install(FILES ${cld2_public_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/cld2/public)
+
+set (full_SOURCE_FILES
+    internal/cld_generated_cjk_uni_prop_80.cc
+    internal/cld2_generated_cjk_compatible.cc
+    internal/cld_generated_cjk_delta_bi_32.cc
+    internal/generated_distinct_bi_0.cc
+    internal/cld2_generated_quad0122.cc
+    internal/cld2_generated_deltaocta0122.cc
+    internal/cld2_generated_distinctocta0122.cc
+    internal/cld_generated_score_quad_octa_0122.cc
+    )
+
+add_executable(compact_lang_det_test_full ${full_SOURCE_FILES} internal/compact_lang_det_test.cc)
+add_executable(cld2_unittest_full         ${full_SOURCE_FILES} internal/cld2_unittest_full.cc)
+add_executable(cld2_unittest_full_avoid   ${full_SOURCE_FILES} internal/cld2_unittest_full.cc)
+set_target_properties(cld2_unittest_full_avoid PROPERTIES COMPILE_FLAGS "-Davoid_utf8_string_constants")
+
+add_executable(cld2_dynamic_data_tool               internal/cld2_dynamic_data_extractor.cc internal/cld2_dynamic_data_tool.cc)
+add_executable(compact_lang_det_dynamic_test_chrome ${common_SOURCE_FILES} internal/cld2_dynamic_data_extractor.cc internal/compact_lang_det_test.cc)
+add_executable(cld2_dynamic_unittest                ${common_SOURCE_FILES} internal/cld2_unittest.cc)
+set_target_properties(compact_lang_det_dynamic_test_chrome PROPERTIES COMPILE_FLAGS "-DCLD2_DYNAMIC_MODE")
+set_target_properties(cld2_dynamic_unittest PROPERTIES COMPILE_FLAGS "-DCLD2_DYNAMIC_MODE")
+
+add_executable(compact_lang_det_test_chrome_2  internal/compact_lang_det_test.cc)
+add_executable(compact_lang_det_test_chrome_16 internal/compact_lang_det_test.cc)
+add_executable(cld2_unittest_chrome_2          internal/cld2_unittest.cc)
+add_executable(cld2_unittest_avoid_chrome_2    internal/cld2_unittest.cc)
+set_target_properties(cld2_unittest_avoid_chrome_2 PROPERTIES COMPILE_FLAGS "-Davoid_utf8_string_constants")
+
+target_link_libraries(compact_lang_det_test_full cld2)
+target_link_libraries(cld2_unittest_full cld2)
+target_link_libraries(cld2_unittest_full_avoid cld2)
+target_link_libraries(cld2_dynamic_data_tool cld2 cld2_dynamic)
+target_link_libraries(compact_lang_det_dynamic_test_chrome cld2_dynamic)
+target_link_libraries(cld2_dynamic_unittest cld2_dynamic)
+target_link_libraries(compact_lang_det_test_chrome_2 cld2)
+target_link_libraries(compact_lang_det_test_chrome_16 cld2)
+target_link_libraries(cld2_unittest_chrome_2 cld2)
+target_link_libraries(cld2_unittest_avoid_chrome_2 cld2)

package/shared-modules/cld2/cld2.json

@@ -0,0 +1,24 @@
+{
+    "name": "cld2",
+    "buildsystem": "simple",
+    "build-options": {
+        "cxxflags": "-std=c++98"
+    },
+    "build-commands": [
+        "cp CMakeLists.txt ./cld2",
+        "cmake -B _flatpak_build -S cld2 -G Ninja -DCMAKE_INSTALL_PREFIX=/app -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_BUILD_TYPE=Release -DCMAKE_POLICY_VERSION_MINIMUM=3.5",
+        "ninja -C _flatpak_build && ninja -C _flatpak_build install"
+    ],
+    "sources":[
+        {
+            "type": "git",
+            "url": "https://github.com/CLD2Owners/cld2.git",
+            "commit": "84b58a5d7690ebf05a91406f371ce00c3daf31c0",
+            "dest": "cld2"
+        },
+        {
+            "type": "file",
+            "path": "CMakeLists.txt"
+        }
+    ]
+}