From 82ca2e91053271f67aa26b8d33c729ff09a881df Mon Sep 17 00:00:00 2001 From: Yth - Arnaud Date: Thu, 23 Aug 2018 23:58:20 +0100 Subject: libraries/SDL_kitchensink: Updated for version 1.0.4. Signed-off-by: David Spencer --- .../SDL_kitchensink/SDL_kitchensink.SlackBuild | 16 +- libraries/SDL_kitchensink/SDL_kitchensink.info | 6 +- libraries/SDL_kitchensink/slackware-14.2.patch | 289 +++++++++++++++++++++ 3 files changed, 304 insertions(+), 7 deletions(-) create mode 100644 libraries/SDL_kitchensink/slackware-14.2.patch (limited to 'libraries/SDL_kitchensink') diff --git a/libraries/SDL_kitchensink/SDL_kitchensink.SlackBuild b/libraries/SDL_kitchensink/SDL_kitchensink.SlackBuild index b66fd68b931d..78681a77b04d 100644 --- a/libraries/SDL_kitchensink/SDL_kitchensink.SlackBuild +++ b/libraries/SDL_kitchensink/SDL_kitchensink.SlackBuild @@ -21,7 +21,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=SDL_kitchensink -VERSION=${VERSION:-0.0.7} +VERSION=${VERSION:-1.0.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -62,8 +62,8 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$SRCVER -tar xvf $CWD/$PRGNAM-$SRCVER-alpha.tar.gz -cd $PRGNAM-$SRCVER-alpha +tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz +cd $PRGNAM-$SRCVER chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -71,10 +71,18 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +for i in $CWD/*.patch +do + echo + echo "Applying patch $i ..." + cat $i | patch -p1 || exit 1 +done +echo + mkdir -p build cd build cmake \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release .. make diff --git a/libraries/SDL_kitchensink/SDL_kitchensink.info b/libraries/SDL_kitchensink/SDL_kitchensink.info index be46ca8bc6ab..a9e34a8efc5c 100644 --- a/libraries/SDL_kitchensink/SDL_kitchensink.info +++ b/libraries/SDL_kitchensink/SDL_kitchensink.info @@ -1,8 +1,8 @@ PRGNAM="SDL_kitchensink" -VERSION="0.0.7" +VERSION="1.0.4" HOMEPAGE="https://github.com/katajakasa/SDL_kitchensink" -DOWNLOAD="https://github.com/katajakasa/SDL_kitchensink/archive/0.0.7-alpha/SDL_kitchensink-0.0.7-alpha.tar.gz" -MD5SUM="ff973ae6a78dd0b90c045ddb2eab7979" +DOWNLOAD="https://github.com/katajakasa/SDL_kitchensink/archive/1.0.4/SDL_kitchensink-1.0.4.tar.gz" +MD5SUM="5102f70335d6c2b784cc35b372cf484d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="SDL2 libass cunit ffmpeg" diff --git a/libraries/SDL_kitchensink/slackware-14.2.patch b/libraries/SDL_kitchensink/slackware-14.2.patch new file mode 100644 index 000000000000..1468d8741ded --- /dev/null +++ b/libraries/SDL_kitchensink/slackware-14.2.patch @@ -0,0 +1,289 @@ +diff -Naur SDL_kitchensink-1.0.4-o/CMakeLists.txt SDL_kitchensink-1.0.4/CMakeLists.txt +--- SDL_kitchensink-1.0.4-o/CMakeLists.txt 2018-07-13 17:18:32.000000000 +0200 ++++ SDL_kitchensink-1.0.4/CMakeLists.txt 2018-07-23 10:05:19.626764361 +0200 +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.7) ++cmake_minimum_required(VERSION 3.5) + project(SDL_kitchensink C) + include(GNUInstallDirs) + set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) +diff -Naur SDL_kitchensink-1.0.4-o/examples/example_audio.c SDL_kitchensink-1.0.4/examples/example_audio.c +--- SDL_kitchensink-1.0.4-o/examples/example_audio.c 2018-07-13 17:18:32.000000000 +0200 ++++ SDL_kitchensink-1.0.4/examples/example_audio.c 2018-07-23 10:05:19.626764361 +0200 +@@ -1,5 +1,5 @@ + #include +-#include ++#include + #include + #include + +diff -Naur SDL_kitchensink-1.0.4-o/examples/example_complex.c SDL_kitchensink-1.0.4/examples/example_complex.c +--- SDL_kitchensink-1.0.4-o/examples/example_complex.c 2018-07-13 17:18:32.000000000 +0200 ++++ SDL_kitchensink-1.0.4/examples/example_complex.c 2018-07-23 10:05:19.626764361 +0200 +@@ -1,5 +1,5 @@ + #include +-#include ++#include + #include + #include + +diff -Naur SDL_kitchensink-1.0.4-o/examples/example_custom.c SDL_kitchensink-1.0.4/examples/example_custom.c +--- SDL_kitchensink-1.0.4-o/examples/example_custom.c 2018-07-13 17:18:32.000000000 +0200 ++++ SDL_kitchensink-1.0.4/examples/example_custom.c 2018-07-23 10:05:19.626764361 +0200 +@@ -1,5 +1,5 @@ + #include +-#include ++#include + #include + #include + +diff -Naur SDL_kitchensink-1.0.4-o/examples/example_rwops.c SDL_kitchensink-1.0.4/examples/example_rwops.c +--- SDL_kitchensink-1.0.4-o/examples/example_rwops.c 2018-07-13 17:18:32.000000000 +0200 ++++ SDL_kitchensink-1.0.4/examples/example_rwops.c 2018-07-23 10:07:54.411755394 +0200 +@@ -1,5 +1,5 @@ + #include +-#include ++#include + #include + #include + +diff -Naur SDL_kitchensink-1.0.4-o/examples/example_simple.c SDL_kitchensink-1.0.4/examples/example_simple.c +--- SDL_kitchensink-1.0.4-o/examples/example_simple.c 2018-07-13 17:18:32.000000000 +0200 ++++ SDL_kitchensink-1.0.4/examples/example_simple.c 2018-07-23 10:05:19.627764361 +0200 +@@ -1,5 +1,5 @@ + #include +-#include ++#include + #include + #include + +diff -Naur SDL_kitchensink-1.0.4-o/include/kitchensink/internal/kitdecoder.h SDL_kitchensink-1.0.4/include/kitchensink/internal/kitdecoder.h +--- SDL_kitchensink-1.0.4-o/include/kitchensink/internal/kitdecoder.h 2018-07-13 17:18:32.000000000 +0200 ++++ SDL_kitchensink-1.0.4/include/kitchensink/internal/kitdecoder.h 2018-07-23 10:05:19.627764361 +0200 +@@ -3,7 +3,7 @@ + + #include + +-#include ++#include + #include + #include + +diff -Naur SDL_kitchensink-1.0.4-o/include/kitchensink/internal/subtitle/kitatlas.h SDL_kitchensink-1.0.4/include/kitchensink/internal/subtitle/kitatlas.h +--- SDL_kitchensink-1.0.4-o/include/kitchensink/internal/subtitle/kitatlas.h 2018-07-13 17:18:32.000000000 +0200 ++++ SDL_kitchensink-1.0.4/include/kitchensink/internal/subtitle/kitatlas.h 2018-07-23 10:05:19.627764361 +0200 +@@ -2,8 +2,8 @@ + #define KITATLAS_H + + #include +-#include +-#include ++#include ++#include + + #include "kitchensink/kitconfig.h" + +diff -Naur SDL_kitchensink-1.0.4-o/include/kitchensink/internal/subtitle/kitatlas.h~ SDL_kitchensink-1.0.4/include/kitchensink/internal/subtitle/kitatlas.h~ +--- SDL_kitchensink-1.0.4-o/include/kitchensink/internal/subtitle/kitatlas.h~ 1970-01-01 01:00:00.000000000 +0100 ++++ SDL_kitchensink-1.0.4/include/kitchensink/internal/subtitle/kitatlas.h~ 2018-07-23 10:05:19.627764361 +0200 +@@ -0,0 +1,40 @@ ++#ifndef KITATLAS_H ++#define KITATLAS_H ++ ++#include ++#include ++#include ++ ++#include "kitchensink/kitconfig.h" ++ ++typedef struct Kit_TextureAtlasItem { ++ int cur_shelf; //< Current shelf number in cache ++ int cur_slot; //< Current slot on shelf in cache ++ SDL_Rect source; //< Source coordinates on cache surface ++ SDL_Rect target; //< Target coordinates on output surface ++} Kit_TextureAtlasItem; ++ ++typedef struct Kit_Shelf { ++ uint16_t width; ++ uint16_t height; ++ uint16_t count; ++} Kit_Shelf; ++ ++typedef struct Kit_TextureAtlas { ++ int cur_items; //< Current items count ++ int max_items; //< Maximum items count ++ int max_shelves; //< Maximum shelf count ++ int w; //< Current atlas width ++ int h; //< Current atlas height ++ Kit_TextureAtlasItem *items; //< Cached items ++ Kit_Shelf *shelves; //< Atlas shelves ++} Kit_TextureAtlas; ++ ++KIT_LOCAL Kit_TextureAtlas* Kit_CreateAtlas(); ++KIT_LOCAL void Kit_FreeAtlas(Kit_TextureAtlas *atlas); ++KIT_LOCAL void Kit_ClearAtlasContent(Kit_TextureAtlas *atlas); ++KIT_LOCAL void Kit_CheckAtlasTextureSize(Kit_TextureAtlas *atlas, SDL_Texture *texture); ++KIT_LOCAL int Kit_GetAtlasItems(const Kit_TextureAtlas *atlas, SDL_Rect *sources, SDL_Rect *targets, int limit); ++KIT_LOCAL int Kit_AddAtlasItem(Kit_TextureAtlas *atlas, SDL_Texture *texture, SDL_Surface *surface, const SDL_Rect *target); ++ ++#endif // KITATLAS_H +diff -Naur SDL_kitchensink-1.0.4-o/include/kitchensink/internal/subtitle/kitsubtitle.h SDL_kitchensink-1.0.4/include/kitchensink/internal/subtitle/kitsubtitle.h +--- SDL_kitchensink-1.0.4-o/include/kitchensink/internal/subtitle/kitsubtitle.h 2018-07-13 17:18:32.000000000 +0200 ++++ SDL_kitchensink-1.0.4/include/kitchensink/internal/subtitle/kitsubtitle.h 2018-07-23 10:05:19.627764361 +0200 +@@ -1,7 +1,7 @@ + #ifndef KITSUBTITLE_H + #define KITSUBTITLE_H + +-#include ++#include + + #include "kitchensink/kitconfig.h" + #include "kitchensink/kitsource.h" +diff -Naur SDL_kitchensink-1.0.4-o/include/kitchensink/internal/subtitle/kitsubtitlepacket.h SDL_kitchensink-1.0.4/include/kitchensink/internal/subtitle/kitsubtitlepacket.h +--- SDL_kitchensink-1.0.4-o/include/kitchensink/internal/subtitle/kitsubtitlepacket.h 2018-07-13 17:18:32.000000000 +0200 ++++ SDL_kitchensink-1.0.4/include/kitchensink/internal/subtitle/kitsubtitlepacket.h 2018-07-23 10:05:19.628764361 +0200 +@@ -2,7 +2,7 @@ + #define KITSUBTITLEPACKET_H + + #include +-#include ++#include + + #include "kitchensink/kitconfig.h" + +diff -Naur SDL_kitchensink-1.0.4-o/include/kitchensink/internal/subtitle/renderers/kitsubrenderer.h SDL_kitchensink-1.0.4/include/kitchensink/internal/subtitle/renderers/kitsubrenderer.h +--- SDL_kitchensink-1.0.4-o/include/kitchensink/internal/subtitle/renderers/kitsubrenderer.h 2018-07-13 17:18:32.000000000 +0200 ++++ SDL_kitchensink-1.0.4/include/kitchensink/internal/subtitle/renderers/kitsubrenderer.h 2018-07-23 10:05:19.628764361 +0200 +@@ -1,7 +1,7 @@ + #ifndef KITSUBRENDERER_H + #define KITSUBRENDERER_H + +-#include ++#include + + #include "kitchensink/kitsource.h" + +diff -Naur SDL_kitchensink-1.0.4-o/include/kitchensink/internal/video/kitvideo.h SDL_kitchensink-1.0.4/include/kitchensink/internal/video/kitvideo.h +--- SDL_kitchensink-1.0.4-o/include/kitchensink/internal/video/kitvideo.h 2018-07-13 17:18:32.000000000 +0200 ++++ SDL_kitchensink-1.0.4/include/kitchensink/internal/video/kitvideo.h 2018-07-23 10:05:19.628764361 +0200 +@@ -1,7 +1,7 @@ + #ifndef KITVIDEO_H + #define KITVIDEO_H + +-#include ++#include + + #include "kitchensink/kitconfig.h" + #include "kitchensink/kitsource.h" +diff -Naur SDL_kitchensink-1.0.4-o/include/kitchensink/kitplayer.h SDL_kitchensink-1.0.4/include/kitchensink/kitplayer.h +--- SDL_kitchensink-1.0.4-o/include/kitchensink/kitplayer.h 2018-07-13 17:18:32.000000000 +0200 ++++ SDL_kitchensink-1.0.4/include/kitchensink/kitplayer.h 2018-07-23 10:05:19.628764361 +0200 +@@ -14,7 +14,7 @@ + #include "kitchensink/kitformat.h" + #include "kitchensink/kitcodec.h" + +-#include ++#include + + #ifdef __cplusplus + extern "C" { +diff -Naur SDL_kitchensink-1.0.4-o/include/kitchensink/kitsource.h SDL_kitchensink-1.0.4/include/kitchensink/kitsource.h +--- SDL_kitchensink-1.0.4-o/include/kitchensink/kitsource.h 2018-07-13 17:18:32.000000000 +0200 ++++ SDL_kitchensink-1.0.4/include/kitchensink/kitsource.h 2018-07-23 10:07:42.507756084 +0200 +@@ -10,7 +10,7 @@ + */ + + #include +-#include ++#include + #include "kitchensink/kitconfig.h" + + #ifdef __cplusplus +diff -Naur SDL_kitchensink-1.0.4-o/src/internal/audio/kitaudio.c SDL_kitchensink-1.0.4/src/internal/audio/kitaudio.c +--- SDL_kitchensink-1.0.4-o/src/internal/audio/kitaudio.c 2018-07-13 17:18:32.000000000 +0200 ++++ SDL_kitchensink-1.0.4/src/internal/audio/kitaudio.c 2018-07-23 10:05:19.628764361 +0200 +@@ -5,7 +5,7 @@ + #include + #include + #include +-#include ++#include + + #include "kitchensink/kiterror.h" + #include "kitchensink/internal/kitlibstate.h" +diff -Naur SDL_kitchensink-1.0.4-o/src/internal/libass.c SDL_kitchensink-1.0.4/src/internal/libass.c +--- SDL_kitchensink-1.0.4-o/src/internal/libass.c 2018-07-13 17:18:32.000000000 +0200 ++++ SDL_kitchensink-1.0.4/src/internal/libass.c 2018-07-23 10:05:19.629764361 +0200 +@@ -1,6 +1,6 @@ + #ifdef USE_DYNAMIC_LIBASS + +-#include ++#include + #include "kitchensink/internal/libass.h" + + int load_libass(void *handle) { +diff -Naur SDL_kitchensink-1.0.4-o/src/internal/subtitle/kitsubtitle.c SDL_kitchensink-1.0.4/src/internal/subtitle/kitsubtitle.c +--- SDL_kitchensink-1.0.4-o/src/internal/subtitle/kitsubtitle.c 2018-07-13 17:18:32.000000000 +0200 ++++ SDL_kitchensink-1.0.4/src/internal/subtitle/kitsubtitle.c 2018-07-23 10:05:19.629764361 +0200 +@@ -1,6 +1,6 @@ + #include + +-#include ++#include + #include + + #include "kitchensink/internal/utils/kitlog.h" +diff -Naur SDL_kitchensink-1.0.4-o/src/internal/subtitle/renderers/kitsubass.c SDL_kitchensink-1.0.4/src/internal/subtitle/renderers/kitsubass.c +--- SDL_kitchensink-1.0.4-o/src/internal/subtitle/renderers/kitsubass.c 2018-07-13 17:18:32.000000000 +0200 ++++ SDL_kitchensink-1.0.4/src/internal/subtitle/renderers/kitsubass.c 2018-07-23 10:05:19.629764361 +0200 +@@ -1,7 +1,7 @@ + #include + #include + +-#include ++#include + + #include "kitchensink/kiterror.h" + #include "kitchensink/internal/utils/kitlog.h" +diff -Naur SDL_kitchensink-1.0.4-o/src/internal/subtitle/renderers/kitsubimage.c SDL_kitchensink-1.0.4/src/internal/subtitle/renderers/kitsubimage.c +--- SDL_kitchensink-1.0.4-o/src/internal/subtitle/renderers/kitsubimage.c 2018-07-13 17:18:32.000000000 +0200 ++++ SDL_kitchensink-1.0.4/src/internal/subtitle/renderers/kitsubimage.c 2018-07-23 10:05:19.629764361 +0200 +@@ -1,7 +1,7 @@ + #include + #include + +-#include ++#include + + #include "kitchensink/kiterror.h" + #include "kitchensink/internal/utils/kitlog.h" +diff -Naur SDL_kitchensink-1.0.4-o/src/kitlib.c SDL_kitchensink-1.0.4/src/kitlib.c +--- SDL_kitchensink-1.0.4-o/src/kitlib.c 2018-07-13 17:18:32.000000000 +0200 ++++ SDL_kitchensink-1.0.4/src/kitlib.c 2018-07-23 10:05:19.629764361 +0200 +@@ -1,5 +1,5 @@ + #include +-#include ++#include + + #include + +diff -Naur SDL_kitchensink-1.0.4-o/src/kitplayer.c SDL_kitchensink-1.0.4/src/kitplayer.c +--- SDL_kitchensink-1.0.4-o/src/kitplayer.c 2018-07-13 17:18:32.000000000 +0200 ++++ SDL_kitchensink-1.0.4/src/kitplayer.c 2018-07-23 10:05:19.630764361 +0200 +@@ -1,6 +1,6 @@ + #include + +-#include ++#include + + #include "kitchensink/kitplayer.h" + #include "kitchensink/kiterror.h" +diff -Naur SDL_kitchensink-1.0.4-o/src/kitutils.c SDL_kitchensink-1.0.4/src/kitutils.c +--- SDL_kitchensink-1.0.4-o/src/kitutils.c 2018-07-13 17:18:32.000000000 +0200 ++++ SDL_kitchensink-1.0.4/src/kitutils.c 2018-07-23 10:05:19.630764361 +0200 +@@ -1,4 +1,4 @@ +-#include ++#include + + #include "kitchensink/kitutils.h" + #include "kitchensink/kitsource.h" -- cgit v1.2.3