From a1d531d79bd5d07b3503da8747f4c68f53419f56 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Tue, 27 Feb 2018 20:59:13 -0700
Subject: [PATCH] Fixes for pkg-config. Add libpng to netsurf
---
bin/x86_64-unknown-redox-pkg-config | 7 +
config.sh | 1 +
cook.sh | 13 +-
recipes/netsurf/01_redox.patch | 74 +++----
recipes/netsurf/recipe.sh | 6 +-
recipes/sdl/01_orbital.patch | 315 ++++------------------------
recipes/zlib/recipe.sh | 2 +-
7 files changed, 97 insertions(+), 321 deletions(-)
create mode 100644 bin/x86_64-unknown-redox-pkg-config
diff --git a/bin/x86_64-unknown-redox-pkg-config b/bin/x86_64-unknown-redox-pkg-config
new file mode 100644
index 000000000..db91a59ae
--- /dev/null
+++ b/bin/x86_64-unknown-redox-pkg-config
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+export PKG_CONFIG_DIR=
+export PKG_CONFIG_SYSROOT_DIR="${COOKBOOK_RECIPE}/sysroot"
+export PKG_CONFIG_LIBDIR="${PKG_CONFIG_SYSROOT_DIR}/lib/pkgconfig"
+
+exec pkg-config "$@"
diff --git a/config.sh b/config.sh
index f383679e2..6e21f242d 100755
--- a/config.sh
+++ b/config.sh
@@ -9,6 +9,7 @@ HOST=$TARGET
# Automatic variables
ROOT="$(cd `dirname "$0"` && pwd)"
REPO="$ROOT/repo/$TARGET"
+export PATH="${ROOT}/bin:$PATH"
export XARGO_HOME="${ROOT}/xargo"
export AR="${HOST}-ar"
diff --git a/cook.sh b/cook.sh
index a606b629b..c99c2f722 100755
--- a/cook.sh
+++ b/cook.sh
@@ -421,16 +421,13 @@ if [ -n "$1" ]
then
if [ -d "$ROOT/recipes/$1" ]
then
- cd "$ROOT/recipes/$1"
+ export COOKBOOK_RECIPE="${ROOT}/recipes/$1"
- function x86_64-unknown-redox-pkg-config {
- export PKG_CONFIG_PATH=
- export PKG_CONFIG_DIR=
- export PKG_CONFIG_LIBDIR="$PWD/sysroot/lib/pkgconfig"
- export PKG_CONFIG_SYSROOT_DIR="$PWD/sysroot"
+ export PKG_CONFIG_PATH=
+ export PKG_CONFIG_LIBDIR="${COOKBOOK_RECIPE}/sysroot/lib/pkgconfig"
+ export PKG_CONFIG_SYSROOT_DIR="${COOKBOOK_RECIPE}/sysroot"
- exec pkg-config "$@"
- }
+ cd "${COOKBOOK_RECIPE}"
source recipe.sh
diff --git a/recipes/netsurf/01_redox.patch b/recipes/netsurf/01_redox.patch
index a3eae09e5..1014d2b84 100644
--- a/recipes/netsurf/01_redox.patch
+++ b/recipes/netsurf/01_redox.patch
@@ -1,6 +1,6 @@
-diff -rupNw source-original/libnsfb/Makefile source/libnsfb/Makefile
---- source-original/libnsfb/Makefile 2017-10-16 12:09:35.000000000 +0200
-+++ source/libnsfb/Makefile 2018-02-23 14:45:29.000000000 +0100
+diff -rupNw source/libnsfb/Makefile source_redox/libnsfb/Makefile
+--- source/libnsfb/Makefile 2017-10-16 04:09:35.000000000 -0600
++++ source_redox/libnsfb/Makefile 2018-02-27 20:06:03.318184866 -0700
@@ -43,10 +43,10 @@ endif
NSFB_XCB_PKG_NAMES := xcb xcb-icccm xcb-image xcb-keysyms xcb-atom
@@ -15,9 +15,9 @@ diff -rupNw source-original/libnsfb/Makefile source/libnsfb/Makefile
# surfaces not detectable via pkg-config
NSFB_ABLE_AVAILABLE := no
-diff -rupNw source-original/libnsfb/src/plot/32bpp-xbgr8888.c source/libnsfb/src/plot/32bpp-xbgr8888.c
---- source-original/libnsfb/src/plot/32bpp-xbgr8888.c 2017-10-16 12:09:35.000000000 +0200
-+++ source/libnsfb/src/plot/32bpp-xbgr8888.c 2018-02-23 14:45:29.000000000 +0100
+diff -rupNw source/libnsfb/src/plot/32bpp-xbgr8888.c source_redox/libnsfb/src/plot/32bpp-xbgr8888.c
+--- source/libnsfb/src/plot/32bpp-xbgr8888.c 2017-10-16 04:09:35.000000000 -0600
++++ source_redox/libnsfb/src/plot/32bpp-xbgr8888.c 2018-02-27 20:06:03.322184932 -0700
@@ -52,7 +52,7 @@ static inline nsfb_colour_t pixel_to_col
*/
static inline uint32_t colour_to_pixel(UNUSED nsfb_t *nsfb, nsfb_colour_t c)
@@ -36,9 +36,9 @@ diff -rupNw source-original/libnsfb/src/plot/32bpp-xbgr8888.c source/libnsfb/src
}
#endif
-diff -rupNw source-original/libnsfb/src/plot/32bpp-xrgb8888.c source/libnsfb/src/plot/32bpp-xrgb8888.c
---- source-original/libnsfb/src/plot/32bpp-xrgb8888.c 2017-10-16 12:09:35.000000000 +0200
-+++ source/libnsfb/src/plot/32bpp-xrgb8888.c 2018-02-23 14:45:29.000000000 +0100
+diff -rupNw source/libnsfb/src/plot/32bpp-xrgb8888.c source_redox/libnsfb/src/plot/32bpp-xrgb8888.c
+--- source/libnsfb/src/plot/32bpp-xrgb8888.c 2017-10-16 04:09:35.000000000 -0600
++++ source_redox/libnsfb/src/plot/32bpp-xrgb8888.c 2018-02-27 20:06:03.322184932 -0700
@@ -52,7 +52,7 @@ static inline nsfb_colour_t pixel_to_col
*/
static inline uint32_t colour_to_pixel(UNUSED nsfb_t *nsfb, nsfb_colour_t c)
@@ -57,9 +57,9 @@ diff -rupNw source-original/libnsfb/src/plot/32bpp-xrgb8888.c source/libnsfb/src
}
#endif
-diff -rupNw source-original/libnsfb/src/plot.h source/libnsfb/src/plot.h
---- source-original/libnsfb/src/plot.h 2017-10-16 12:09:35.000000000 +0200
-+++ source/libnsfb/src/plot.h 2018-02-23 14:45:29.000000000 +0100
+diff -rupNw source/libnsfb/src/plot.h source_redox/libnsfb/src/plot.h
+--- source/libnsfb/src/plot.h 2017-10-16 04:09:35.000000000 -0600
++++ source_redox/libnsfb/src/plot.h 2018-02-27 20:06:03.318184866 -0700
@@ -36,7 +36,7 @@
#define NSFB_BE_BYTE_ORDER
#endif
@@ -69,9 +69,9 @@ diff -rupNw source-original/libnsfb/src/plot.h source/libnsfb/src/plot.h
#if defined(__BYTE_ORDER__)
#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
#define NSFB_BE_BYTE_ORDER
-diff -rupNw source-original/libnsfb/src/surface/sdl.c source/libnsfb/src/surface/sdl.c
---- source-original/libnsfb/src/surface/sdl.c 2017-10-16 12:09:35.000000000 +0200
-+++ source/libnsfb/src/surface/sdl.c 2018-02-23 14:45:29.000000000 +0100
+diff -rupNw source/libnsfb/src/surface/sdl.c source_redox/libnsfb/src/surface/sdl.c
+--- source/libnsfb/src/surface/sdl.c 2017-10-16 04:09:35.000000000 -0600
++++ source_redox/libnsfb/src/surface/sdl.c 2018-02-27 20:06:03.322184932 -0700
@@ -458,7 +458,7 @@ static int sdl_initialise(nsfb_t *nsfb)
return -1;
@@ -121,9 +121,9 @@ diff -rupNw source-original/libnsfb/src/surface/sdl.c source/libnsfb/src/surface
/* Do nothing if there was no event */
if (got_event == 0) {
-diff -rupNw source-original/libparserutils/src/input/filter.c source/libparserutils/src/input/filter.c
---- source-original/libparserutils/src/input/filter.c 2017-10-16 12:09:36.000000000 +0200
-+++ source/libparserutils/src/input/filter.c 2018-02-23 14:45:29.000000000 +0100
+diff -rupNw source/libparserutils/src/input/filter.c source_redox/libparserutils/src/input/filter.c
+--- source/libparserutils/src/input/filter.c 2017-10-16 04:09:36.000000000 -0600
++++ source_redox/libparserutils/src/input/filter.c 2018-02-27 20:06:03.346185325 -0700
@@ -10,7 +10,7 @@
#include <stdlib.h>
#include <string.h>
@@ -205,9 +205,9 @@ diff -rupNw source-original/libparserutils/src/input/filter.c source/libparserut
if (input->cd != (iconv_t) -1) {
iconv_close(input->cd);
input->cd = (iconv_t) -1;
-diff -rupNw source-original/netsurf/content/fetchers/file.c source/netsurf/content/fetchers/file.c
---- source-original/netsurf/content/fetchers/file.c 2017-10-16 12:09:36.000000000 +0200
-+++ source/netsurf/content/fetchers/file.c 2018-02-23 14:45:29.000000000 +0100
+diff -rupNw source/netsurf/content/fetchers/file.c source_redox/netsurf/content/fetchers/file.c
+--- source/netsurf/content/fetchers/file.c 2017-10-16 04:09:36.000000000 -0600
++++ source_redox/netsurf/content/fetchers/file.c 2018-02-27 20:06:03.518188147 -0700
@@ -39,7 +39,7 @@
#include <time.h>
#include <stdio.h>
@@ -226,9 +226,9 @@ diff -rupNw source-original/netsurf/content/fetchers/file.c source/netsurf/conte
fetch_msg msg;
char *buf = NULL;
size_t buf_size;
-diff -rupNw source-original/netsurf/content/urldb.c source/netsurf/content/urldb.c
---- source-original/netsurf/content/urldb.c 2017-10-16 12:09:36.000000000 +0200
-+++ source/netsurf/content/urldb.c 2018-02-23 14:45:29.000000000 +0100
+diff -rupNw source/netsurf/content/urldb.c source_redox/netsurf/content/urldb.c
+--- source/netsurf/content/urldb.c 2017-10-16 04:09:36.000000000 -0600
++++ source_redox/netsurf/content/urldb.c 2018-02-27 20:06:03.510188016 -0700
@@ -630,7 +630,7 @@ static bool urldb__host_is_ip_address(co
size_t host_len = strlen(host);
const char *sane_host;
@@ -247,9 +247,9 @@ diff -rupNw source-original/netsurf/content/urldb.c source/netsurf/content/urldb
if ((host_len < 6) ||
(sane_host[0] != '[') ||
(sane_host[host_len - 1] != ']')) {
-diff -rupNw source-original/netsurf/Makefile.config source/netsurf/Makefile.config
---- source-original/netsurf/Makefile.config 1970-01-01 01:00:00.000000000 +0100
-+++ source/netsurf/Makefile.config 2018-02-23 18:29:19.624058579 +0100
+diff -rupNw source/netsurf/Makefile.config source_redox/netsurf/Makefile.config
+--- source/netsurf/Makefile.config 1969-12-31 17:00:00.000000000 -0700
++++ source_redox/netsurf/Makefile.config 2018-02-27 20:11:23.710834338 -0700
@@ -0,0 +1,14 @@
+override NETSURF_HOMEPAGE := "https://www.redox-os.org/"
+override NETSURF_FB_FRONTEND := sdl
@@ -259,15 +259,15 @@ diff -rupNw source-original/netsurf/Makefile.config source/netsurf/Makefile.conf
+override NETSURF_USE_OPENSSL := YES
+override NETSURF_USE_CURL := YES
+
-+override NETSURF_USE_PNG := NO
++override NETSURF_USE_PNG := YES
+override NETSURF_USE_NSSVG := NO
+override NETSURF_USE_RSVG := NO
+override NETSURF_USE_DUKTAPE := NO
+override NETSURF_USE_HARU_PDF := NO
+override NETSURF_USE_VIDEO := NO
-diff -rupNw source-original/netsurf/utils/log.c source/netsurf/utils/log.c
---- source-original/netsurf/utils/log.c 2017-10-16 12:09:36.000000000 +0200
-+++ source/netsurf/utils/log.c 2018-02-23 14:45:29.000000000 +0100
+diff -rupNw source/netsurf/utils/log.c source_redox/netsurf/utils/log.c
+--- source/netsurf/utils/log.c 2017-10-16 04:09:36.000000000 -0600
++++ source_redox/netsurf/utils/log.c 2018-02-27 20:06:03.622189853 -0700
@@ -261,18 +261,18 @@ nserror nslog_init(nslog_ensure_t *ensur
/* sucessfull logging initialisation so log system info */
if (ret == NSERROR_OK) {
@@ -297,9 +297,9 @@ diff -rupNw source-original/netsurf/utils/log.c source/netsurf/utils/log.c
}
return ret;
-diff -rupNw source-original/netsurf/utils/useragent.c source/netsurf/utils/useragent.c
---- source-original/netsurf/utils/useragent.c 2017-10-16 12:09:36.000000000 +0200
-+++ source/netsurf/utils/useragent.c 2018-02-23 14:45:29.000000000 +0100
+diff -rupNw source/netsurf/utils/useragent.c source_redox/netsurf/utils/useragent.c
+--- source/netsurf/utils/useragent.c 2017-10-16 04:09:36.000000000 -0600
++++ source_redox/netsurf/utils/useragent.c 2018-02-27 20:06:03.622189853 -0700
@@ -44,9 +44,9 @@ user_agent_build_string(void)
char *ua_string;
int len;
@@ -313,9 +313,9 @@ diff -rupNw source-original/netsurf/utils/useragent.c source/netsurf/utils/usera
len = snprintf(NULL, 0, NETSURF_UA_FORMAT_STRING,
netsurf_version_major,
-diff -rupNw source-original/netsurf/utils/utsname.h source/netsurf/utils/utsname.h
---- source-original/netsurf/utils/utsname.h 2017-10-16 12:09:36.000000000 +0200
-+++ source/netsurf/utils/utsname.h 2018-02-23 14:45:29.000000000 +0100
+diff -rupNw source/netsurf/utils/utsname.h source_redox/netsurf/utils/utsname.h
+--- source/netsurf/utils/utsname.h 2017-10-16 04:09:36.000000000 -0600
++++ source_redox/netsurf/utils/utsname.h 2018-02-27 20:06:03.622189853 -0700
@@ -24,7 +24,7 @@
#ifndef _NETSURF_UTILS_UTSNAME_H_
#define _NETSURF_UTILS_UTSNAME_H_
diff --git a/recipes/netsurf/recipe.sh b/recipes/netsurf/recipe.sh
index 9cea3a33b..cf64d1d2b 100644
--- a/recipes/netsurf/recipe.sh
+++ b/recipes/netsurf/recipe.sh
@@ -1,12 +1,8 @@
VERSION=3.7
TAR=http://download.netsurf-browser.org/netsurf/releases/source-full/netsurf-all-$VERSION.tar.gz
-BUILD_DEPENDS=(expat curl sdl openssl zlib libjpeg libpng)
+BUILD_DEPENDS=(curl expat libjpeg libpng openssl sdl zlib)
DEPENDS="ca-certificates"
-export PKG_CONFIG_PATH=
-export PKG_CONFIG_LIBDIR="$PWD/sysroot/lib/pkgconfig"
-export PKG_CONFIG_SYSROOT_DIR="$PWD/sysroot"
-
function recipe_version {
echo "$VERSION"
skip=1
diff --git a/recipes/sdl/01_orbital.patch b/recipes/sdl/01_orbital.patch
index cec303204..0ec45c042 100644
--- a/recipes/sdl/01_orbital.patch
+++ b/recipes/sdl/01_orbital.patch
@@ -1,6 +1,6 @@
-diff -rupN source-original/build-scripts/config.sub source/build-scripts/config.sub
---- source-original/build-scripts/config.sub 2012-01-19 07:30:05.000000000 +0100
-+++ source/build-scripts/config.sub 2018-02-26 19:43:01.954278409 +0100
+diff -rupN source/build-scripts/config.sub source-redox/build-scripts/config.sub
+--- source/build-scripts/config.sub 2012-01-18 23:30:05.000000000 -0700
++++ source-redox/build-scripts/config.sub 2018-02-27 20:42:46.287901516 -0700
@@ -1276,7 +1276,7 @@ case $os in
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
| -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
@@ -10,9 +10,9 @@ diff -rupN source-original/build-scripts/config.sub source/build-scripts/config.
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
| -aos* | -aros* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-diff -rupN source-original/configure.in source/configure.in
---- source-original/configure.in 2012-01-19 07:30:05.000000000 +0100
-+++ source/configure.in 2018-02-26 19:43:01.954278409 +0100
+diff -rupN source/configure.in source-redox/configure.in
+--- source/configure.in 2012-01-18 23:30:05.000000000 -0700
++++ source-redox/configure.in 2018-02-27 20:42:46.311902357 -0700
@@ -1646,6 +1646,19 @@ AC_HELP_STRING([--enable-video-dummy], [
fi
}
@@ -54,9 +54,9 @@ diff -rupN source-original/configure.in source/configure.in
CheckDiskAudio
CheckDummyAudio
CheckDLOPEN
-diff -rupN source-original/include/SDL_config.h.in source/include/SDL_config.h.in
---- source-original/include/SDL_config.h.in 2012-01-19 07:30:05.000000000 +0100
-+++ source/include/SDL_config.h.in 2018-02-26 19:43:01.954278409 +0100
+diff -rupN source/include/SDL_config.h.in source-redox/include/SDL_config.h.in
+--- source/include/SDL_config.h.in 2012-01-18 23:30:05.000000000 -0700
++++ source-redox/include/SDL_config.h.in 2018-02-27 20:42:46.311902357 -0700
@@ -268,6 +268,7 @@
#undef SDL_VIDEO_DRIVER_GGI
#undef SDL_VIDEO_DRIVER_IPOD
@@ -65,9 +65,9 @@ diff -rupN source-original/include/SDL_config.h.in source/include/SDL_config.h.i
#undef SDL_VIDEO_DRIVER_OS2FS
#undef SDL_VIDEO_DRIVER_PHOTON
#undef SDL_VIDEO_DRIVER_PICOGUI
-diff -rupN source-original/src/video/orbital/SDL_orbitalevents.c source/src/video/orbital/SDL_orbitalevents.c
---- source-original/src/video/orbital/SDL_orbitalevents.c 1970-01-01 01:00:00.000000000 +0100
-+++ source/src/video/orbital/SDL_orbitalevents.c 2018-02-26 19:43:01.998278827 +0100
+diff -rupN source/src/video/orbital/SDL_orbitalevents.c source-redox/src/video/orbital/SDL_orbitalevents.c
+--- source/src/video/orbital/SDL_orbitalevents.c 1969-12-31 17:00:00.000000000 -0700
++++ source-redox/src/video/orbital/SDL_orbitalevents.c 2018-02-27 20:42:46.335903198 -0700
@@ -0,0 +1,190 @@
+/*
+ SDL - Simple DirectMedia Layer
@@ -259,9 +259,9 @@ diff -rupN source-original/src/video/orbital/SDL_orbitalevents.c source/src/vide
+}
+
+/* end of SDL_orbitalevents.c ... */
-diff -rupN source-original/src/video/orbital/SDL_orbitalevents_c.h source/src/video/orbital/SDL_orbitalevents_c.h
---- source-original/src/video/orbital/SDL_orbitalevents_c.h 1970-01-01 01:00:00.000000000 +0100
-+++ source/src/video/orbital/SDL_orbitalevents_c.h 2018-02-26 19:43:01.998278827 +0100
+diff -rupN source/src/video/orbital/SDL_orbitalevents_c.h source-redox/src/video/orbital/SDL_orbitalevents_c.h
+--- source/src/video/orbital/SDL_orbitalevents_c.h 1969-12-31 17:00:00.000000000 -0700
++++ source-redox/src/video/orbital/SDL_orbitalevents_c.h 2018-02-27 20:42:46.335903198 -0700
@@ -0,0 +1,32 @@
+/*
+ SDL - Simple DirectMedia Layer
@@ -295,9 +295,9 @@ diff -rupN source-original/src/video/orbital/SDL_orbitalevents_c.h source/src/vi
+extern void ORBITAL_PumpEvents(_THIS);
+
+/* end of SDL_orbitalevents_c.h ... */
-diff -rupN source-original/src/video/orbital/SDL_orbitalmouse.c source/src/video/orbital/SDL_orbitalmouse.c
---- source-original/src/video/orbital/SDL_orbitalmouse.c 1970-01-01 01:00:00.000000000 +0100
-+++ source/src/video/orbital/SDL_orbitalmouse.c 2018-02-26 19:43:01.998278827 +0100
+diff -rupN source/src/video/orbital/SDL_orbitalmouse.c source-redox/src/video/orbital/SDL_orbitalmouse.c
+--- source/src/video/orbital/SDL_orbitalmouse.c 1969-12-31 17:00:00.000000000 -0700
++++ source-redox/src/video/orbital/SDL_orbitalmouse.c 2018-02-27 20:42:46.335903198 -0700
@@ -0,0 +1,33 @@
+/*
+ SDL - Simple DirectMedia Layer
@@ -332,9 +332,9 @@ diff -rupN source-original/src/video/orbital/SDL_orbitalmouse.c source/src/video
+struct WMcursor {
+ int unused;
+};
-diff -rupN source-original/src/video/orbital/SDL_orbitalmouse_c.h source/src/video/orbital/SDL_orbitalmouse_c.h
---- source-original/src/video/orbital/SDL_orbitalmouse_c.h 1970-01-01 01:00:00.000000000 +0100
-+++ source/src/video/orbital/SDL_orbitalmouse_c.h 2018-02-26 19:43:01.998278827 +0100
+diff -rupN source/src/video/orbital/SDL_orbitalmouse_c.h source-redox/src/video/orbital/SDL_orbitalmouse_c.h
+--- source/src/video/orbital/SDL_orbitalmouse_c.h 1969-12-31 17:00:00.000000000 -0700
++++ source-redox/src/video/orbital/SDL_orbitalmouse_c.h 2018-02-27 20:42:46.335903198 -0700
@@ -0,0 +1,26 @@
+/*
+ SDL - Simple DirectMedia Layer
@@ -362,9 +362,9 @@ diff -rupN source-original/src/video/orbital/SDL_orbitalmouse_c.h source/src/vid
+#include "SDL_orbitalvideo.h"
+
+/* Functions to be exported */
-diff -rupN source-original/src/video/orbital/SDL_orbitalscancode.h source/src/video/orbital/SDL_orbitalscancode.h
---- source-original/src/video/orbital/SDL_orbitalscancode.h 1970-01-01 01:00:00.000000000 +0100
-+++ source/src/video/orbital/SDL_orbitalscancode.h 2018-02-26 19:43:02.002278865 +0100
+diff -rupN source/src/video/orbital/SDL_orbitalscancode.h source-redox/src/video/orbital/SDL_orbitalscancode.h
+--- source/src/video/orbital/SDL_orbitalscancode.h 1969-12-31 17:00:00.000000000 -0700
++++ source-redox/src/video/orbital/SDL_orbitalscancode.h 2018-02-27 20:42:46.335903198 -0700
@@ -0,0 +1,80 @@
+#define SCANCODE_A 0x1E
+#define SCANCODE_B 0x30
@@ -446,9 +446,9 @@ diff -rupN source-original/src/video/orbital/SDL_orbitalscancode.h source/src/vi
+#define SCANCODE_COMMA 0x33
+#define SCANCODE_PERIOD 0x34
+#define SCANCODE_SLASH 0x35
-diff -rupN source-original/src/video/orbital/SDL_orbitalvideo.c source/src/video/orbital/SDL_orbitalvideo.c
---- source-original/src/video/orbital/SDL_orbitalvideo.c 1970-01-01 01:00:00.000000000 +0100
-+++ source/src/video/orbital/SDL_orbitalvideo.c 2018-02-26 19:43:37.246613507 +0100
+diff -rupN source/src/video/orbital/SDL_orbitalvideo.c source-redox/src/video/orbital/SDL_orbitalvideo.c
+--- source/src/video/orbital/SDL_orbitalvideo.c 1969-12-31 17:00:00.000000000 -0700
++++ source-redox/src/video/orbital/SDL_orbitalvideo.c 2018-02-27 20:42:46.335903198 -0700
@@ -0,0 +1,282 @@
+/*
+ SDL - Simple DirectMedia Layer
@@ -732,9 +732,9 @@ diff -rupN source-original/src/video/orbital/SDL_orbitalvideo.c source/src/video
+ this->hidden->fd = 0;
+ }
+}
-diff -rupN source-original/src/video/orbital/SDL_orbitalvideo.h source/src/video/orbital/SDL_orbitalvideo.h
---- source-original/src/video/orbital/SDL_orbitalvideo.h 1970-01-01 01:00:00.000000000 +0100
-+++ source/src/video/orbital/SDL_orbitalvideo.h 2018-02-26 19:43:02.002278865 +0100
+diff -rupN source/src/video/orbital/SDL_orbitalvideo.h source-redox/src/video/orbital/SDL_orbitalvideo.h
+--- source/src/video/orbital/SDL_orbitalvideo.h 1969-12-31 17:00:00.000000000 -0700
++++ source-redox/src/video/orbital/SDL_orbitalvideo.h 2018-02-27 20:42:46.335903198 -0700
@@ -0,0 +1,41 @@
+/*
+ SDL - Simple DirectMedia Layer
@@ -777,79 +777,22 @@ diff -rupN source-original/src/video/orbital/SDL_orbitalvideo.h source/src/video
+};
+
+#endif /* _SDL_orbitalvideo_h */
-diff -rupN source-original/src/video/SDL_gamma.c source/src/video/SDL_gamma.c
---- source-original/src/video/SDL_gamma.c 2012-01-19 07:30:06.000000000 +0100
-+++ source/src/video/SDL_gamma.c 2018-02-26 19:43:02.002278865 +0100
-@@ -23,9 +23,9 @@
-
- /* Gamma correction support */
-
--#ifdef HAVE_MATH_H
--#include <math.h> /* Used for calculating gamma ramps */
--#else
-+//#ifdef HAVE_MATH_H
-+//#include <math.h> /* Used for calculating gamma ramps */
-+//#else
- /* Math routines from uClibc: http://www.uclibc.org */
- #include "math_private.h"
- #include "e_sqrt.h"
-@@ -33,7 +33,7 @@
- #include "e_log.h"
- #define pow(x, y) __ieee754_pow(x, y)
+diff -rupN source/src/video/SDL_gamma.c source-redox/src/video/SDL_gamma.c
+--- source/src/video/SDL_gamma.c 2012-01-18 23:30:06.000000000 -0700
++++ source-redox/src/video/SDL_gamma.c 2018-02-27 20:56:59.314549375 -0700
+@@ -35,6 +35,9 @@
#define log(x) __ieee754_log(x)
--#endif
-+//#endif
+ #endif
++#include "e_log.h"
++#define log(x) __ieee754_log(x)
++
#include "SDL_sysvideo.h"
-@@ -94,7 +94,7 @@ int SDL_SetGamma(float red, float green,
- {
- int succeeded;
- SDL_VideoDevice *video = current_video;
-- SDL_VideoDevice *this = current_video;
-+ SDL_VideoDevice *this = current_video;
-
- succeeded = -1;
- /* Prefer using SetGammaRamp(), as it's more flexible */
-@@ -120,7 +120,7 @@ int SDL_GetGamma(float *red, float *gree
- {
- int succeeded;
- SDL_VideoDevice *video = current_video;
-- SDL_VideoDevice *this = current_video;
-+ SDL_VideoDevice *this = current_video;
- succeeded = -1;
- /* Prefer using GetGammaRamp(), as it's more flexible */
-@@ -145,7 +145,7 @@ int SDL_SetGammaRamp(const Uint16 *red,
- {
- int succeeded;
- SDL_VideoDevice *video = current_video;
-- SDL_VideoDevice *this = current_video;
-+ SDL_VideoDevice *this = current_video;
- SDL_Surface *screen = SDL_PublicSurface;
-
- /* Verify the screen parameter */
-@@ -177,7 +177,7 @@ int SDL_SetGammaRamp(const Uint16 *red,
- /* If physical palette has been set independently, use it */
- if(video->physpal)
- pal = video->physpal;
--
-+
- SDL_SetPalette(screen, SDL_PHYSPAL,
- pal->colors, 0, pal->ncolors);
- return 0;
-@@ -196,7 +196,7 @@ int SDL_SetGammaRamp(const Uint16 *red,
- int SDL_GetGammaRamp(Uint16 *red, Uint16 *green, Uint16 *blue)
- {
- SDL_VideoDevice *video = current_video;
-- SDL_VideoDevice *this = current_video;
-+ SDL_VideoDevice *this = current_video;
-
- /* Lazily allocate the gamma table */
- if ( ! video->gamma ) {
-diff -rupN source-original/src/video/SDL_sysvideo.h source/src/video/SDL_sysvideo.h
---- source-original/src/video/SDL_sysvideo.h 2012-01-19 07:30:06.000000000 +0100
-+++ source/src/video/SDL_sysvideo.h 2018-02-26 19:43:02.002278865 +0100
+diff -rupN source/src/video/SDL_sysvideo.h source-redox/src/video/SDL_sysvideo.h
+--- source/src/video/SDL_sysvideo.h 2012-01-18 23:30:06.000000000 -0700
++++ source-redox/src/video/SDL_sysvideo.h 2018-02-27 20:42:46.335903198 -0700
@@ -410,6 +410,9 @@ extern VideoBootStrap AALIB_bootstrap;
#if SDL_VIDEO_DRIVER_CACA
extern VideoBootStrap CACA_bootstrap;
@@ -860,9 +803,9 @@ diff -rupN source-original/src/video/SDL_sysvideo.h source/src/video/SDL_sysvide
#if SDL_VIDEO_DRIVER_DUMMY
extern VideoBootStrap DUMMY_bootstrap;
#endif
-diff -rupN source-original/src/video/SDL_video.c source/src/video/SDL_video.c
---- source-original/src/video/SDL_video.c 2012-01-19 07:30:06.000000000 +0100
-+++ source/src/video/SDL_video.c 2018-02-26 19:43:02.002278865 +0100
+diff -rupN source/src/video/SDL_video.c source-redox/src/video/SDL_video.c
+--- source/src/video/SDL_video.c 2012-01-18 23:30:06.000000000 -0700
++++ source-redox/src/video/SDL_video.c 2018-02-27 20:45:30.447873197 -0700
@@ -126,6 +126,9 @@ static VideoBootStrap *bootstrap[] = {
#if SDL_VIDEO_DRIVER_CACA
&CACA_bootstrap,
@@ -873,33 +816,6 @@ diff -rupN source-original/src/video/SDL_video.c source/src/video/SDL_video.c
#if SDL_VIDEO_DRIVER_DUMMY
&DUMMY_bootstrap,
#endif
-@@ -217,7 +220,7 @@ int SDL_VideoInit (const char *driver_na
- video->offset_x = 0;
- video->offset_y = 0;
- SDL_memset(&video->info, 0, (sizeof video->info));
--
-+
- video->displayformatalphapixel = NULL;
-
- /* Set some very sane GL defaults */
-@@ -240,7 +243,7 @@ int SDL_VideoInit (const char *driver_na
- video->gl_config.multisamplesamples = 0;
- video->gl_config.accelerated = -1; /* not known, don't set */
- video->gl_config.swap_control = -1; /* not known, don't set */
--
-+
- /* Initialize the video subsystem */
- SDL_memset(&vformat, 0, sizeof(vformat));
- if ( video->VideoInit(video, &vformat) < 0 ) {
-@@ -397,7 +400,7 @@ int SDL_VideoModeOK (int width, int heig
- if ( sizes == (SDL_Rect **)0 ) {
- /* No sizes supported at this bit-depth */
- continue;
-- } else
-+ } else
- if (sizes == (SDL_Rect **)NEGATIVE_ONE) {
- /* Any size supported at this bit-depth */
- supported = 1;
@@ -726,7 +729,8 @@ SDL_Surface * SDL_SetVideoMode (int widt
video->offset_y = 0;
mode->offset = 0;
@@ -910,121 +826,7 @@ diff -rupN source-original/src/video/SDL_video.c source/src/video/SDL_video.c
/* Now adjust the offsets to match the desired mode */
video->offset_x = (mode->w-width)/2;
-@@ -788,7 +792,7 @@ SDL_Surface * SDL_SetVideoMode (int widt
- #endif /* __SDL_NOGETPROCADDR__ */
-
- #include "SDL_glfuncs.h"
--#undef SDL_PROC
-+#undef SDL_PROC
- }
- #endif /* SDL_VIDEO_OPENGL */
-
-@@ -817,9 +821,9 @@ SDL_Surface * SDL_SetVideoMode (int widt
- ) {
- video->is_32bit = 0;
- SDL_VideoSurface = SDL_CreateRGBSurface(
-- flags,
-- width,
-- height,
-+ flags,
-+ width,
-+ height,
- 16,
- 31 << 11,
- 63 << 5,
-@@ -832,10 +836,10 @@ SDL_Surface * SDL_SetVideoMode (int widt
- {
- video->is_32bit = 1;
- SDL_VideoSurface = SDL_CreateRGBSurface(
-- flags,
-- width,
-- height,
-- 32,
-+ flags,
-+ width,
-+ height,
-+ 32,
- #if SDL_BYTEORDER == SDL_LIL_ENDIAN
- 0x000000FF,
- 0x0000FF00,
-@@ -893,7 +897,7 @@ SDL_Surface * SDL_SetVideoMode (int widt
- (
- ( !(flags&SDL_ANYFORMAT) &&
- (SDL_VideoSurface->format->BitsPerPixel != bpp)) ||
-- ( (flags&SDL_HWPALETTE) &&
-+ ( (flags&SDL_HWPALETTE) &&
- !(SDL_VideoSurface->flags&SDL_HWPALETTE)) ||
- /* If the surface is in hardware, video writes are visible
- as soon as they are performed, so we need to buffer them
-@@ -921,7 +925,7 @@ SDL_Surface * SDL_SetVideoMode (int widt
- return(SDL_PublicSurface);
- }
-
--/*
-+/*
- * Convert a surface into the video pixel format.
- */
- SDL_Surface * SDL_DisplayFormat (SDL_Surface *surface)
-@@ -935,7 +939,7 @@ SDL_Surface * SDL_DisplayFormat (SDL_Sur
- /* Set the flags appropriate for copying to display surface */
- if (((SDL_PublicSurface->flags&SDL_HWSURFACE) == SDL_HWSURFACE) && current_video->info.blit_hw)
- flags = SDL_HWSURFACE;
-- else
-+ else
- flags = SDL_SWSURFACE;
- #ifdef AUTORLE_DISPLAYFORMAT
- flags |= (surface->flags & (SDL_SRCCOLORKEY|SDL_SRCALPHA));
-@@ -1063,14 +1067,14 @@ void SDL_UpdateRects (SDL_Surface *scree
- SDL_LockCursor();
- SDL_DrawCursor(SDL_ShadowSurface);
- for ( i=0; i<numrects; ++i ) {
-- SDL_LowerBlit(SDL_ShadowSurface, &rects[i],
-+ SDL_LowerBlit(SDL_ShadowSurface, &rects[i],
- SDL_VideoSurface, &rects[i]);
- }
- SDL_EraseCursor(SDL_ShadowSurface);
- SDL_UnlockCursor();
- } else {
- for ( i=0; i<numrects; ++i ) {
-- SDL_LowerBlit(SDL_ShadowSurface, &rects[i],
-+ SDL_LowerBlit(SDL_ShadowSurface, &rects[i],
- SDL_VideoSurface, &rects[i]);
- }
- }
-@@ -1576,42 +1580,42 @@ void SDL_GL_UpdateRects(int numrects, SD
-
- if ( update.h > 256 )
- update.h = 256;
--
-+
- this->glFlush();
-- this->glTexSubImage2D(
-- GL_TEXTURE_2D,
-- 0,
-- 0,
-- 0,
-- update.w,
-- update.h,
-+ this->glTexSubImage2D(
-+ GL_TEXTURE_2D,
-+ 0,
-+ 0,
-+ 0,
-+ update.w,
-+ update.h,
- this->is_32bit? GL_RGBA : GL_RGB,
- #ifdef GL_VERSION_1_2
- this->is_32bit ? GL_UNSIGNED_BYTE : GL_UNSIGNED_SHORT_5_6_5,
- #else
- GL_UNSIGNED_BYTE,
- #endif
-- (Uint8 *)this->screen->pixels +
-- this->screen->format->BytesPerPixel * update.x +
-+ (Uint8 *)this->screen->pixels +
-+ this->screen->format->BytesPerPixel * update.x +
- update.y * this->screen->pitch );
--
-+
+@@ -1598,7 +1602,7 @@ void SDL_GL_UpdateRects(int numrects, SD
this->glFlush();
/*
* Note the parens around the function name:
@@ -1033,30 +835,3 @@ diff -rupN source-original/src/video/SDL_video.c source/src/video/SDL_video.c
* as macros, and we don't want them expanded here.
*/
this->glBegin(GL_TRIANGLE_STRIP);
-- (this->glTexCoord2f)( 0.0, 0.0 );
-+ (this->glTexCoord2f)( 0.0, 0.0 );
- (this->glVertex2i)( update.x, update.y );
-- (this->glTexCoord2f)( (float)(update.w / 256.0), 0.0 );
-+ (this->glTexCoord2f)( (float)(update.w / 256.0), 0.0 );
- (this->glVertex2i)( update.x + update.w, update.y );
- (this->glTexCoord2f)( 0.0, (float)(update.h / 256.0) );
- (this->glVertex2i)( update.x, update.y + update.h );
-- (this->glTexCoord2f)( (float)(update.w / 256.0), (float)(update.h / 256.0) );
-+ (this->glTexCoord2f)( (float)(update.w / 256.0), (float)(update.h / 256.0) );
- (this->glVertex2i)( update.x + update.w , update.y + update.h );
-- this->glEnd();
--
-+ this->glEnd();
-+
- tmp.x += 256;
- tmp.w -= 256;
- }
-@@ -1641,7 +1645,7 @@ void SDL_GL_Lock()
- this->glDisable(GL_FOG);
- this->glDisable(GL_ALPHA_TEST);
- this->glDisable(GL_DEPTH_TEST);
-- this->glDisable(GL_SCISSOR_TEST);
-+ this->glDisable(GL_SCISSOR_TEST);
- this->glDisable(GL_STENCIL_TEST);
- this->glDisable(GL_CULL_FACE);
-
diff --git a/recipes/zlib/recipe.sh b/recipes/zlib/recipe.sh
index 42ca0eeba..1aa1cd8e9 100644
--- a/recipes/zlib/recipe.sh
+++ b/recipes/zlib/recipe.sh
@@ -30,6 +30,6 @@ function recipe_clean {
function recipe_stage {
dest="$(realpath $1)"
make DESTDIR="$dest" install
- rm -rf "$1"/{lib/pkgconfig,share}
+ rm -rf "$1"/share
skip=1
}
--
GitLab