diff --git a/packaging/flatpak/com.freerdp.FreeRDP.json b/packaging/flatpak/com.freerdp.FreeRDP.json index cef08a206..28cd9793d 100644 --- a/packaging/flatpak/com.freerdp.FreeRDP.json +++ b/packaging/flatpak/com.freerdp.FreeRDP.json @@ -42,8 +42,7 @@ }, "modules": [ "modules/libusb.json", - "modules/SDL2-2.28.1-with-libdecor.json", - "modules/SDL2_ttf-2.20.2.json", + "modules/uriparser.json", "modules/cJSON-1.7.16.json", "modules/xprop-1.2.6.json", "modules/pcsc-1.9.9.json", @@ -75,6 +74,7 @@ "-DWITH_SAMPLE:BOOL=ON", "-DWITH_CUPS:BOOL=ON", "-DWITH_FFMPEG:BOOL=ON", + "-DWITH_URIPARSER:BOOL=ON", "-DWITH_DSP_FFMPEG:BOOL=ON", "-DWITH_OSS:BOOL=OFF", "-DWITH_WEBVIEW:BOOL=OFF", diff --git a/packaging/flatpak/modules/SDL2-2.28.1-with-libdecor.json b/packaging/flatpak/modules/SDL2-2.28.1-with-libdecor.json deleted file mode 100644 index 77fa6d015..000000000 --- a/packaging/flatpak/modules/SDL2-2.28.1-with-libdecor.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "name": "SDL2", - "buildsystem": "autotools", - "config-opts": ["--disable-static"], - "sources": [ - { - "type": "archive", - "url": "https://github.com/libsdl-org/SDL/releases/download/release-2.28.1/SDL2-2.28.1.tar.gz", - "sha256": "4977ceba5c0054dbe6c2f114641aced43ce3bf2b41ea64b6a372d6ba129cb15d" - } - ], - "cleanup": [ "/bin/sdl2-config", - "/include", - "/lib/libSDL2.la", - "/lib/libSDL2main.a", - "/lib/libSDL2main.la", - "/lib/libSDL2_test.a", - "/lib/libSDL2_test.la", - "/lib/cmake", - "/share/aclocal", - "/lib/pkgconfig"], - "modules": [ "../shared-modules/libdecor/libdecor-0.1.1.json" ] -} diff --git a/packaging/flatpak/modules/SDL2_ttf-2.20.2.json b/packaging/flatpak/modules/SDL2_ttf-2.20.2.json deleted file mode 100644 index 19cb3087f..000000000 --- a/packaging/flatpak/modules/SDL2_ttf-2.20.2.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "name": "SDL_ttf", - "config-opts": ["--disable-static"], - "rm-configure": true, - "config-opts": [ - "ac_cv_path_FREETYPE_CONFIG=pkg-config freetype2" - ], - "sources": [ - { - "type": "archive", - "url": "https://github.com/libsdl-org/SDL_ttf/releases/download/release-2.20.2/SDL2_ttf-2.20.2.tar.gz", - "sha256": "9dc71ed93487521b107a2c4a9ca6bf43fb62f6bddd5c26b055e6b91418a22053" - }, - { - "type": "script", - "dest-filename": "autogen.sh", - "commands": [ - "AUTOMAKE=\"automake --foreign\" autoreconf -vfi" - ] - } - ] -} diff --git a/packaging/flatpak/modules/cJSON-1.7.16.json b/packaging/flatpak/modules/cJSON-1.7.16.json index 1c019d5c8..8456bafd8 100644 --- a/packaging/flatpak/modules/cJSON-1.7.16.json +++ b/packaging/flatpak/modules/cJSON-1.7.16.json @@ -6,8 +6,7 @@ "config-opts": [ "-DCMAKE_VERBOSE_MAKEFILE=ON", "-DCMAKE_BUILD_TYPE:STRING=Release", - "-DCMAKE_INSTALL_LIBDIR:PATH=lib", - "-DWITH_PULSE:BOOL=ON" + "-DCMAKE_INSTALL_LIBDIR:PATH=lib" ], "sources": [ { diff --git a/packaging/flatpak/modules/uriparser.json b/packaging/flatpak/modules/uriparser.json new file mode 100644 index 000000000..db5ac9b2b --- /dev/null +++ b/packaging/flatpak/modules/uriparser.json @@ -0,0 +1,23 @@ +{ + "name": "uriparser", + "buildsystem": "cmake-ninja", + "cleanup": [ + ], + "config-opts": [ + "-DCMAKE_VERBOSE_MAKEFILE=ON", + "-DCMAKE_BUILD_TYPE:STRING=Release", + "-DCMAKE_INSTALL_LIBDIR:PATH=lib", + "-DURIPARSER_BUILD_TESTS:BOOL=OFF", + "-DURIPARSER_BUILD_DOCS:BOOL=OFF", + "-DURIPARSER_BUILD_TOOLS:BOOL=OFF", + "-DURIPARSER_BUILD_WCHAR_T:BOOL=OFF" + ], + "sources": [ + { + "type": "git", + "url": "https://github.com/uriparser/uriparser.git", + "tag": "uriparser-0.9.7", + "commit": "634b678fa858abf1d1ebc0634e96e9e29596e92a" + } + ] +}