From 6577715f73ba12f3c531e855e5d7c798c08d3f8a Mon Sep 17 00:00:00 2001 From: David Korth Date: Sat, 7 Jun 2025 14:38:47 -0400 Subject: [PATCH] [librpbase] APNG_dlopen.h: Don't export APNG_ref() and APNG_unref(). It's only used by librpbase internally. This is technically an ABI break, even though these functions weren't used outside of librpbase, so bump the SOVERSION to 7. --- debian/control | 18 +++++++++--------- debian/{libromdata6.docs => libromdata7.docs} | 0 ...libromdata6.install => libromdata7.install} | 0 src/libromdata/CMakeLists.txt | 4 ++-- src/librpbase/img/APNG_dlopen.h | 3 --- src/win32/CMakeLists.txt | 4 ++-- 6 files changed, 13 insertions(+), 16 deletions(-) rename debian/{libromdata6.docs => libromdata7.docs} (100%) rename debian/{libromdata6.install => libromdata7.install} (100%) diff --git a/debian/control b/debian/control index 88b642ae0..fdff3f302 100644 --- a/debian/control +++ b/debian/control @@ -42,7 +42,7 @@ Vcs-Browser: https://github.com/GerbilSoft/rom-properties Package: rom-properties-all Architecture: any -Depends: ${misc:Depends}, libromdata6, rom-properties-kde4, rom-properties-kf5, rom-properties-xfce, rom-properties-gtk3, rom-properties-cli, rom-properties-tracker, rom-properties-utils, rom-properties-lang, rom-properties-thumbnailer-dbus +Depends: ${misc:Depends}, libromdata7, rom-properties-kde4, rom-properties-kf5, rom-properties-xfce, rom-properties-gtk3, rom-properties-cli, rom-properties-tracker, rom-properties-utils, rom-properties-lang, rom-properties-thumbnailer-dbus Description: ROM Properties Page shell extension (meta package) This shell extension provides thumbnailing and property page functionality for ROM images, disc images, and save files for various game consoles, @@ -50,7 +50,7 @@ Description: ROM Properties Page shell extension (meta package) . This is a meta-package that installs all rom-properties packages. -Package: libromdata6 +Package: libromdata7 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, rom-properties-data, liblz4-1, liblzo2-2 Description: ROM Properties Page shell extension (shared library) @@ -63,7 +63,7 @@ Description: ROM Properties Page shell extension (shared library) Package: rom-properties-kde4 Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libromdata6, rom-properties-utils, rom-properties-xdg +Depends: ${shlibs:Depends}, ${misc:Depends}, libromdata7, rom-properties-utils, rom-properties-xdg Recommends: rom-properties-lang Description: ROM Properties Page shell extension (KDE4 UI frontend) This shell extension provides thumbnailing and property page functionality @@ -74,7 +74,7 @@ Description: ROM Properties Page shell extension (KDE4 UI frontend) Package: rom-properties-kio-servicemenus Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends}, libromdata6, rom-properties-utils +Depends: ${shlibs:Depends}, ${misc:Depends}, libromdata7, rom-properties-utils Conflicts: rom-properties-kf5 (<< 2.3) Replaces: rom-properties-kf5 (<< 2.3) Description: ROM Properties Page shell extension (KF5/KF6 service menus) @@ -86,7 +86,7 @@ Description: ROM Properties Page shell extension (KF5/KF6 service menus) Package: rom-properties-kf5 Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libromdata6, rom-properties-utils, rom-properties-xdg, rom-properties-kio-servicemenus +Depends: ${shlibs:Depends}, ${misc:Depends}, libromdata7, rom-properties-utils, rom-properties-xdg, rom-properties-kio-servicemenus Recommends: rom-properties-lang Conflicts: rom-properties-kde5 Replaces: rom-properties-kde5 @@ -99,7 +99,7 @@ Description: ROM Properties Page shell extension (KF5 UI frontend) Package: rom-properties-xfce Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libromdata6, rom-properties-utils, rom-properties-xdg, rom-properties-thumbnailer-dbus +Depends: ${shlibs:Depends}, ${misc:Depends}, libromdata7, rom-properties-utils, rom-properties-xdg, rom-properties-thumbnailer-dbus Recommends: rom-properties-lang, rom-properties-tracker Description: ROM Properties Page shell extension (GTK2 XFCE UI frontend) This shell extension provides thumbnailing and property page functionality @@ -113,7 +113,7 @@ Description: ROM Properties Page shell extension (GTK2 XFCE UI frontend) Package: rom-properties-gtk3 Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libromdata6, rom-properties-utils, rom-properties-xdg, rom-properties-thumbnailer-dbus +Depends: ${shlibs:Depends}, ${misc:Depends}, libromdata7, rom-properties-utils, rom-properties-xdg, rom-properties-thumbnailer-dbus Recommends: rom-properties-lang, rom-properties-tracker Conflicts: rom-properties-gnome, rom-properties-mate, rom-properties-cinnamon, rom-properties-gtk3-common Replaces: rom-properties-gnome, rom-properties-mate, rom-properties-cinnamon, rom-properties-gtk3-common @@ -132,7 +132,7 @@ Description: ROM Properties Page shell extension (GTK3 UI frontend) Package: rom-properties-cli Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libromdata6 +Depends: ${shlibs:Depends}, ${misc:Depends}, libromdata7 Recommends: rom-properties-lang Description: ROM Properties Page shell extension (command line version) This shell extension provides thumbnailing and property page functionality @@ -143,7 +143,7 @@ Description: ROM Properties Page shell extension (command line version) Package: rom-properties-tracker Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libromdata6 +Depends: ${shlibs:Depends}, ${misc:Depends}, libromdata7 Description: ROM Properties Page shell extension (Tracker metadata extractor module) This shell extension provides thumbnailing and property page functionality for ROM images, disc images, and save files for various game consoles, diff --git a/debian/libromdata6.docs b/debian/libromdata7.docs similarity index 100% rename from debian/libromdata6.docs rename to debian/libromdata7.docs diff --git a/debian/libromdata6.install b/debian/libromdata7.install similarity index 100% rename from debian/libromdata6.install rename to debian/libromdata7.install diff --git a/src/libromdata/CMakeLists.txt b/src/libromdata/CMakeLists.txt index e5c96c729..b0cbed41b 100644 --- a/src/libromdata/CMakeLists.txt +++ b/src/libromdata/CMakeLists.txt @@ -461,8 +461,8 @@ IF(RP_LIBROMDATA_IS_DLL) ADD_DEFINITIONS(-DRP_BUILDING_FOR_DLL=1) # NOTE: Not using the project version here. # This represents the ABI version. - SET(${PROJECT_NAME}_VERSION 6.2) - SET(${PROJECT_NAME}_SOVERSION 6) + SET(${PROJECT_NAME}_VERSION 7.0) + SET(${PROJECT_NAME}_SOVERSION 7) IF(MSVC) # Delay-load sources. SET(${PROJECT_NAME}-DELAYLOAD_SRC ../libwin32common/DelayLoadHelper.c) diff --git a/src/librpbase/img/APNG_dlopen.h b/src/librpbase/img/APNG_dlopen.h index e80102c5c..56a854029 100644 --- a/src/librpbase/img/APNG_dlopen.h +++ b/src/librpbase/img/APNG_dlopen.h @@ -9,7 +9,6 @@ #pragma once #include "librpbase/config.librpbase.h" -#include "dll-macros.h" #include @@ -26,13 +25,11 @@ extern "C" { * * @return 0 on success; non-zero on error. */ -RP_LIBROMDATA_PUBLIC extern int RP_C_API APNG_ref(void); /** * Decrement the APNG reference counter. */ -RP_LIBROMDATA_PUBLIC extern void RP_C_API APNG_unref(void); /** diff --git a/src/win32/CMakeLists.txt b/src/win32/CMakeLists.txt index 8923d00e4..4bb98ef7c 100644 --- a/src/win32/CMakeLists.txt +++ b/src/win32/CMakeLists.txt @@ -207,8 +207,8 @@ IF(RP_LIBROMDATA_IS_DLL AND MSVC) # Otherwise, we won't be able to load it if it's in an # architecture-specific subdirectory. # TODO: Global variable with the libromdata SOVERSION? - SET(DL_DEBUG_FLAGS "${DL_DEBUG_FLAGS} /DELAYLOAD:romdata-6d.dll") - SET(DL_RELEASE_FLAGS "${DL_RELEASE_FLAGS} /DELAYLOAD:romdata-6.dll") + SET(DL_DEBUG_FLAGS "${DL_DEBUG_FLAGS} /DELAYLOAD:romdata-7d.dll") + SET(DL_RELEASE_FLAGS "${DL_RELEASE_FLAGS} /DELAYLOAD:romdata-7.dll") SET(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} ${DL_DEBUG_FLAGS}") SET(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} ${DL_RELEASE_FLAGS}")