mirror of
https://gitlab.redox-os.org/redox-os/redox.git
synced 2026-11-05 04:06:38 +08:00
Compare commits
10 Commits
d486b6d7a9
...
2c909a036e
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2c909a036e | ||
|
|
3650a613f3 | ||
|
|
d2abc86a7c | ||
|
|
c33cf12401 | ||
|
|
f236d86e60 | ||
|
|
c57bba090a | ||
|
|
9bf257dbab | ||
|
|
b7352eecfd | ||
|
|
d15b5f9220 | ||
|
|
858a19e150 |
@ -141,6 +141,10 @@ You can see all open issues on [this](https://gitlab.redox-os.org/groups/redox-o
|
||||
|
||||
Please follow [our process](https://doc.redox-os.org/book/creating-proper-pull-requests.html) for creating proper pull requests.
|
||||
|
||||
### Pull Requests Pipelines
|
||||
|
||||
The GitLab CI pipelines is runnable only by maintainer review, otherwise it will be seen as "stuck". Please don't hesitate to ask in Matrix for triggering CI pipelines after being reviewed.
|
||||
|
||||
## Important Places to Contribute
|
||||
|
||||
Before starting to contribute, we recommend reading the [General FAQ](https://www.redox-os.org/faq/) and the [Redox Book](https://doc.redox-os.org/book/).
|
||||
|
||||
@ -176,6 +176,7 @@ mesa = {}
|
||||
mesa-glu = {}
|
||||
mesa-demos = {}
|
||||
mesa-demos-x11 = {}
|
||||
meson = {}
|
||||
mgba = {}
|
||||
miniserve = {}
|
||||
mpc = {}
|
||||
|
||||
@ -1,76 +0,0 @@
|
||||
From effadce6c756247ea8bae32dc13bb3e6f464f0eb Mon Sep 17 00:00:00 2001
|
||||
From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
|
||||
Date: Sun, 16 Jul 2023 18:18:02 +0300
|
||||
Subject: [PATCH] avcodec/x86/mathops: clip constants used with shift
|
||||
instructions within inline assembly
|
||||
|
||||
Fixes assembling with binutil as >= 2.41
|
||||
|
||||
Signed-off-by: James Almer <jamrial@gmail.com>
|
||||
---
|
||||
libavcodec/x86/mathops.h | 26 +++++++++++++++++++++++---
|
||||
1 file changed, 23 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/libavcodec/x86/mathops.h b/libavcodec/x86/mathops.h
|
||||
index 6298f5ed19..ca7e2dffc1 100644
|
||||
--- a/libavcodec/x86/mathops.h
|
||||
+++ b/libavcodec/x86/mathops.h
|
||||
@@ -35,12 +35,20 @@
|
||||
static av_always_inline av_const int MULL(int a, int b, unsigned shift)
|
||||
{
|
||||
int rt, dummy;
|
||||
+ if (__builtin_constant_p(shift))
|
||||
__asm__ (
|
||||
"imull %3 \n\t"
|
||||
"shrdl %4, %%edx, %%eax \n\t"
|
||||
:"=a"(rt), "=d"(dummy)
|
||||
- :"a"(a), "rm"(b), "ci"((uint8_t)shift)
|
||||
+ :"a"(a), "rm"(b), "i"(shift & 0x1F)
|
||||
);
|
||||
+ else
|
||||
+ __asm__ (
|
||||
+ "imull %3 \n\t"
|
||||
+ "shrdl %4, %%edx, %%eax \n\t"
|
||||
+ :"=a"(rt), "=d"(dummy)
|
||||
+ :"a"(a), "rm"(b), "c"((uint8_t)shift)
|
||||
+ );
|
||||
return rt;
|
||||
}
|
||||
|
||||
@@ -113,19 +121,31 @@ __asm__ volatile(\
|
||||
// avoid +32 for shift optimization (gcc should do that ...)
|
||||
#define NEG_SSR32 NEG_SSR32
|
||||
static inline int32_t NEG_SSR32( int32_t a, int8_t s){
|
||||
+ if (__builtin_constant_p(s))
|
||||
__asm__ ("sarl %1, %0\n\t"
|
||||
: "+r" (a)
|
||||
- : "ic" ((uint8_t)(-s))
|
||||
+ : "i" (-s & 0x1F)
|
||||
);
|
||||
+ else
|
||||
+ __asm__ ("sarl %1, %0\n\t"
|
||||
+ : "+r" (a)
|
||||
+ : "c" ((uint8_t)(-s))
|
||||
+ );
|
||||
return a;
|
||||
}
|
||||
|
||||
#define NEG_USR32 NEG_USR32
|
||||
static inline uint32_t NEG_USR32(uint32_t a, int8_t s){
|
||||
+ if (__builtin_constant_p(s))
|
||||
__asm__ ("shrl %1, %0\n\t"
|
||||
: "+r" (a)
|
||||
- : "ic" ((uint8_t)(-s))
|
||||
+ : "i" (-s & 0x1F)
|
||||
);
|
||||
+ else
|
||||
+ __asm__ ("shrl %1, %0\n\t"
|
||||
+ : "+r" (a)
|
||||
+ : "c" ((uint8_t)(-s))
|
||||
+ );
|
||||
return a;
|
||||
}
|
||||
|
||||
--
|
||||
2.30.2
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
diff -rupN source-original/configure source/configure
|
||||
--- source-original/configure 2018-03-04 11:13:59.000000000 +0100
|
||||
+++ source/configure 2018-03-04 11:18:10.026033282 +0100
|
||||
@@ -5141,6 +5141,8 @@ case $target_os in
|
||||
diff -ruwN source/configure source-new/configure
|
||||
--- source/configure 2026-05-05 14:22:01.000000000 +0000
|
||||
+++ source-new/configure 2026-11-02 05:18:51.788806151 +0000
|
||||
@@ -5814,6 +5814,8 @@
|
||||
;;
|
||||
minix)
|
||||
;;
|
||||
@ -10,15 +10,3 @@ diff -rupN source-original/configure source/configure
|
||||
none)
|
||||
;;
|
||||
*)
|
||||
diff -rupN source-original/fftools/ffmpeg.c source/fftools/ffmpeg.c
|
||||
--- source-original/fftools/ffmpeg.c 2018-03-04 11:13:59.000000000 +0100
|
||||
+++ source/fftools/ffmpeg.c 2018-03-04 11:45:38.326394016 +0100
|
||||
@@ -91,7 +91,7 @@
|
||||
|
||||
#if HAVE_TERMIOS_H
|
||||
#include <fcntl.h>
|
||||
-#include <sys/ioctl.h>
|
||||
+//#include <sys/ioctl.h>
|
||||
#include <sys/time.h>
|
||||
#include <termios.h>
|
||||
#elif HAVE_KBHIT
|
||||
|
||||
@ -1,9 +1,8 @@
|
||||
[source]
|
||||
tar = "https://ffmpeg.org/releases/ffmpeg-6.0.tar.xz"
|
||||
blake3 = "4879074c357102f85932673044c57c144b0c188ae58edec2a115965536ee340f"
|
||||
tar = "https://ffmpeg.org/releases/ffmpeg-6.1.5.tar.xz"
|
||||
blake3 = "da8e6743d96f27d5b5425339218f9a954d9440cb27ba449b449d686b411292e9"
|
||||
patches = [
|
||||
"ffmpeg.patch",
|
||||
"binutils-2.41.patch",
|
||||
]
|
||||
|
||||
[build]
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
[source]
|
||||
tar = "https://github.com/nghttp2/nghttp2/releases/download/v1.64.0/nghttp2-1.64.0.tar.xz"
|
||||
blake3 = "1bbc08de4816769d800c42f501a00c1ba3f5efa1b76e1f65d2e5bdf3aa30354d"
|
||||
tar = "https://github.com/nghttp2/nghttp2/releases/download/v1.69.0/nghttp2-1.69.0.tar.xz"
|
||||
blake3 = "dd7432762ac454aaa14ff3b29d40d5b8f641ec3c33e4e24c5ed70e971ac6987b"
|
||||
script = """
|
||||
autotools_recursive_regenerate
|
||||
"""
|
||||
@ -14,4 +14,4 @@ COOKBOOK_CONFIGURE_FLAGS+=(
|
||||
--enable-lib-only
|
||||
)
|
||||
cookbook_configure
|
||||
"""
|
||||
"""
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
[source]
|
||||
tar = "https://github.com/openssl/openssl/releases/download/openssl-3.5.3/openssl-3.5.3.tar.gz"
|
||||
blake3 = "e1622a4587c71c278355bf38ff5a619918bd51e3cd37214d53dd5345b187fc10"
|
||||
tar = "https://github.com/openssl/openssl/releases/download/openssl-3.5.9/openssl-3.5.9.tar.gz"
|
||||
blake3 = "be2f7530fe5cd02a06e67d8916e6574f1c53b8071393aae2364b4ed817cf0354"
|
||||
patches = [ "redox.patch" ]
|
||||
|
||||
[build]
|
||||
|
||||
@ -1,19 +1,19 @@
|
||||
diff -ruwN source/apps/lib/apps.c source-new/apps/lib/apps.c
|
||||
--- source/apps/lib/apps.c 2025-09-16 19:05:33.000000000 +0700
|
||||
+++ source-new/apps/lib/apps.c 2026-05-05 05:08:40.007422945 +0700
|
||||
@@ -2839,7 +2839,7 @@
|
||||
--- source/apps/lib/apps.c 2026-09-29 14:05:00.000000000 +0000
|
||||
+++ source-new/apps/lib/apps.c 2026-11-02 13:12:01.017080874 +0000
|
||||
@@ -2863,7 +2863,7 @@
|
||||
return ret;
|
||||
}
|
||||
|
||||
-#elif defined(_SC_CLK_TCK) /* by means of unistd.h */
|
||||
+#elif defined(_SC_CLK_TCK) && !defined(__RELIBC__) /* by means of unistd.h */
|
||||
# include <sys/times.h>
|
||||
-#elif defined(_SC_CLK_TCK) /* by means of unistd.h */
|
||||
+#elif defined(_SC_CLK_TCK) && !defined(__RELIBC__) /* by means of unistd.h */
|
||||
#include <sys/times.h>
|
||||
|
||||
double app_tminterval(int stop, int usertime)
|
||||
diff -ruwN source/Configurations/10-main.conf source-new/Configurations/10-main.conf
|
||||
--- source/Configurations/10-main.conf 2025-09-16 19:05:33.000000000 +0700
|
||||
+++ source-new/Configurations/10-main.conf 2026-05-05 05:08:44.812616321 +0700
|
||||
@@ -208,6 +208,40 @@
|
||||
--- source/Configurations/10-main.conf 2026-09-29 14:05:00.000000000 +0000
|
||||
+++ source-new/Configurations/10-main.conf 2026-11-02 13:09:11.387128346 +0000
|
||||
@@ -209,6 +209,40 @@
|
||||
shared_extension => ".so",
|
||||
},
|
||||
|
||||
@ -54,7 +54,7 @@ diff -ruwN source/Configurations/10-main.conf source-new/Configurations/10-main.
|
||||
#### Solaris configurations
|
||||
"solaris-common" => {
|
||||
inherit_from => [ "BASE_unix" ],
|
||||
@@ -693,7 +727,6 @@
|
||||
@@ -694,7 +728,6 @@
|
||||
shared_target => "linux-shared",
|
||||
shared_cflag => "-fPIC",
|
||||
shared_ldflag => sub { $disabled{pinshared} ? () : "-Wl,-znodelete" },
|
||||
@ -62,7 +62,7 @@ diff -ruwN source/Configurations/10-main.conf source-new/Configurations/10-main.
|
||||
},
|
||||
"linux-latomic" => {
|
||||
inherit_from => [ "linux-generic32" ],
|
||||
@@ -890,7 +923,6 @@
|
||||
@@ -891,7 +924,6 @@
|
||||
bn_ops => "SIXTY_FOUR_BIT_LONG",
|
||||
asm_arch => 'x86_64',
|
||||
perlasm_scheme => "elf",
|
||||
@ -71,14 +71,14 @@ diff -ruwN source/Configurations/10-main.conf source-new/Configurations/10-main.
|
||||
"linux-x86_64-clang" => {
|
||||
inherit_from => [ "linux-x86_64" ],
|
||||
diff -ruwN source/include/crypto/rand.h source-new/include/crypto/rand.h
|
||||
--- source/include/crypto/rand.h 2025-09-16 19:05:33.000000000 +0700
|
||||
+++ source-new/include/crypto/rand.h 2026-05-05 05:08:40.007980910 +0700
|
||||
@@ -41,7 +41,7 @@
|
||||
--- source/include/crypto/rand.h 2026-09-29 14:05:00.000000000 +0000
|
||||
+++ source-new/include/crypto/rand.h 2026-11-02 13:10:37.658190042 +0000
|
||||
@@ -40,7 +40,7 @@
|
||||
* default, we will try to read at least one of these files
|
||||
*/
|
||||
# define DEVRANDOM "/dev/urandom", "/dev/random", "/dev/hwrng", "/dev/srandom"
|
||||
-# if defined(__linux) && !defined(__ANDROID__)
|
||||
+# if defined(__linux) && !defined(__RELIBC__) && !defined(__ANDROID__) /* needs sys/shm.h */
|
||||
# ifndef DEVRANDOM_WAIT
|
||||
# define DEVRANDOM_WAIT "/dev/random"
|
||||
# endif
|
||||
#define DEVRANDOM "/dev/urandom", "/dev/random", "/dev/hwrng", "/dev/srandom"
|
||||
-#if defined(__linux) && !defined(__ANDROID__)
|
||||
+#if defined(__linux) && !defined(__ANDROID__) && !defined(__RELIBC__) /* needs sys/shm.h */
|
||||
#ifndef DEVRANDOM_WAIT
|
||||
#define DEVRANDOM_WAIT "/dev/random"
|
||||
#endif
|
||||
|
||||
@ -1,29 +0,0 @@
|
||||
diff --git a/lib/asyn-thrdd.c b/lib/asyn-thrdd.c
|
||||
index 90f055c2..4db5ab02 100644
|
||||
--- a/lib/asyn-thrdd.c
|
||||
+++ b/lib/asyn-thrdd.c
|
||||
@@ -481,7 +481,11 @@ static void async_thrdd_report_item(struct Curl_easy *data,
|
||||
struct dynbuf tmp;
|
||||
const char *sep = "";
|
||||
const struct Curl_addrinfo *ai = item->res;
|
||||
+#ifdef USE_IPV6
|
||||
int ai_family = (item->dns_queries & CURL_DNSQ_AAAA) ? AF_INET6 : AF_INET;
|
||||
+#else
|
||||
+ int ai_family = AF_INET;
|
||||
+#endif
|
||||
CURLcode result;
|
||||
|
||||
if(!CURL_TRC_DNS_is_verbose(data))
|
||||
@@ -789,10 +793,12 @@ const struct Curl_addrinfo *Curl_async_get_ai(struct Curl_easy *data,
|
||||
if(thrdd->res_A)
|
||||
return async_thrdd_get_ai(thrdd->res_A->res, ai_family, index);
|
||||
break;
|
||||
+#ifdef USE_IPV6
|
||||
case AF_INET6:
|
||||
if(thrdd->res_AAAA)
|
||||
return async_thrdd_get_ai(thrdd->res_AAAA->res, ai_family, index);
|
||||
break;
|
||||
+#endif
|
||||
default:
|
||||
break;
|
||||
}
|
||||
@ -1,7 +1,7 @@
|
||||
[source]
|
||||
git = "https://github.com/curl/curl.git"
|
||||
rev = "curl-8_20_0"
|
||||
patches = ["ipv6.patch", "redox.patch"]
|
||||
rev = "curl-8_23_0"
|
||||
patches = ["redox.patch"]
|
||||
shallow_clone = true
|
||||
|
||||
[build]
|
||||
@ -16,12 +16,10 @@ cmakeflags = [
|
||||
"-DCURL_DISABLE_FTP=On",
|
||||
"-DCURL_DISABLE_TFTP=On",
|
||||
"-DENABLE_IPV6=Off",
|
||||
"-DCURL_DISABLE_NTLM=On",
|
||||
"-DENABLE_THREADED_RESOLVER=On",
|
||||
"-DCURL_CA_PATH=/etc/ssl/certs",
|
||||
"-DUSE_NGHTTP2=On",
|
||||
"-DCURL_USE_OPENSSL=On",
|
||||
"-DUSE_ZLIB=On",
|
||||
"-DCURL_USE_LIBPSL=Off",
|
||||
]
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
diff --git a/curl-config.in b/curl-config.in
|
||||
index a1c8185875..326ea2b9d3 100644
|
||||
index a1c81858..326ea2b9 100644
|
||||
--- a/curl-config.in
|
||||
+++ b/curl-config.in
|
||||
@@ -167,7 +167,7 @@ while test "$#" -gt 0; do
|
||||
@ -12,7 +12,7 @@ index a1c8185875..326ea2b9d3 100644
|
||||
echo 'curl was built with static libraries disabled' >&2
|
||||
exit 1
|
||||
diff --git a/include/curl/curl.h b/include/curl/curl.h
|
||||
index 6961a6c4c1..66221b85e3 100644
|
||||
index ccc9a09a..2aa0e69c 100644
|
||||
--- a/include/curl/curl.h
|
||||
+++ b/include/curl/curl.h
|
||||
@@ -88,7 +88,7 @@
|
||||
@ -24,7 +24,7 @@ index 6961a6c4c1..66221b85e3 100644
|
||||
defined(ANDROID) || defined(__ANDROID__) || defined(__OpenBSD__) || \
|
||||
defined(__CYGWIN__) || defined(AMIGA) || defined(__NuttX__) || \
|
||||
(defined(__FreeBSD_version) && (__FreeBSD_version < 800000)) || \
|
||||
@@ -975,11 +975,11 @@ typedef enum {
|
||||
@@ -987,11 +987,11 @@ typedef enum {
|
||||
/* Backwards compatibility with older names */
|
||||
/* These are scheduled to disappear by 2009 */
|
||||
|
||||
@ -42,10 +42,10 @@ index 6961a6c4c1..66221b85e3 100644
|
||||
#endif /* !CURL_NO_OLDIES */
|
||||
|
||||
diff --git a/libcurl.pc.in b/libcurl.pc.in
|
||||
index c0ba5244a8..7898dae358 100644
|
||||
index 8f7e35dd..78650251 100644
|
||||
--- a/libcurl.pc.in
|
||||
+++ b/libcurl.pc.in
|
||||
@@ -36,6 +36,6 @@ Version: @CURLVERSION@
|
||||
@@ -40,7 +40,7 @@ Source: https://curl.se/download/curl-@CURLVERSION@.tar.gz
|
||||
Requires: @LIBCURL_PC_REQUIRES@
|
||||
Requires.private: @LIBCURL_PC_REQUIRES_PRIVATE@
|
||||
Libs: -L${libdir} -lcurl @LIBCURL_PC_LIBS@
|
||||
@ -53,3 +53,4 @@ index c0ba5244a8..7898dae358 100644
|
||||
+Libs.private: @LIBCURL_PC_LIBS_PRIVATE@
|
||||
Cflags: -I${includedir} @LIBCURL_PC_CFLAGS@
|
||||
Cflags.private: @LIBCURL_PC_CFLAGS_PRIVATE@
|
||||
Link.ABI: c
|
||||
|
||||
@ -1,5 +1,18 @@
|
||||
#TODO create a standalone script: https://github.com/mesonbuild/meson#creating-a-standalone-script
|
||||
#TODO compiled but not tested
|
||||
[source]
|
||||
tar = "https://github.com/mesonbuild/meson/releases/download/1.3.0/meson-1.3.0.tar.gz"
|
||||
git = "https://github.com/mesonbuild/meson"
|
||||
rev = "1.12.1"
|
||||
shallow_clone = true
|
||||
|
||||
[build]
|
||||
template = "custom"
|
||||
template = "python"
|
||||
dev-dependencies = [
|
||||
"host:python312",
|
||||
"python312",
|
||||
"python3-setuptools",
|
||||
]
|
||||
|
||||
[package]
|
||||
dependencies = [
|
||||
"python312",
|
||||
]
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
# TODO: Not tested
|
||||
[source]
|
||||
tar = "https://www.python.org/ftp/python/3.15.0/Python-3.15.0a8.tar.xz"
|
||||
blake3 = "b1e24434fc15b352b07222e44e6ff12ce14bbbe8535928a13123ee6a49fa6541"
|
||||
tar = "https://www.python.org/ftp/python/3.15.2/Python-3.15.2.tar.xz"
|
||||
blake3 = "be2eb5c42e774473b40d02c6c74839dec00b779ec24c593cb324b4f8c460acf4"
|
||||
patches = [
|
||||
"redox.patch"
|
||||
]
|
||||
@ -54,7 +54,7 @@ fi
|
||||
cookbook_configure
|
||||
|
||||
# A same file to save 73MB
|
||||
(cd "${COOKBOOK_STAGE}/usr/lib/python3.15/config-3.15" && \
|
||||
(cd "${COOKBOOK_STAGE}/usr/lib/python3.15/config-3.15-${ARCH}-${OS}" && \
|
||||
rm -f libpython3.15.a && ln -s ../../libpython3.15.a)
|
||||
"""
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
diff -ruwN source/configure source-new/configure
|
||||
--- source/configure 2026-04-07 18:24:03.000000000 +0700
|
||||
+++ source-new/configure 2026-05-07 12:19:48.765197728 +0700
|
||||
@@ -4163,6 +4163,9 @@
|
||||
--- source/configure 2026-10-25 16:57:51.000000000 +0000
|
||||
+++ source-new/configure 2026-11-02 05:14:13.172455982 +0000
|
||||
@@ -4178,6 +4178,9 @@
|
||||
*-*-wasi*)
|
||||
ac_sys_system=WASI
|
||||
;;
|
||||
@ -11,7 +11,7 @@ diff -ruwN source/configure source-new/configure
|
||||
*)
|
||||
# for now, limit cross builds to known configurations
|
||||
MACHDEP="unknown"
|
||||
@@ -4189,6 +4192,7 @@
|
||||
@@ -4204,6 +4207,7 @@
|
||||
freebsd*) MACHDEP="freebsd";;
|
||||
linux-android*) MACHDEP="android";;
|
||||
linux*) MACHDEP="linux";;
|
||||
@ -19,7 +19,7 @@ diff -ruwN source/configure source-new/configure
|
||||
cygwin*) MACHDEP="cygwin";;
|
||||
darwin*) MACHDEP="darwin";;
|
||||
'') MACHDEP="unknown";;
|
||||
@@ -4615,7 +4619,7 @@
|
||||
@@ -4630,7 +4634,7 @@
|
||||
|
||||
if test "$cross_compiling" = yes; then
|
||||
case "$host" in
|
||||
@ -28,7 +28,7 @@ diff -ruwN source/configure source-new/configure
|
||||
case "$host_cpu" in
|
||||
arm*)
|
||||
_host_ident=arm
|
||||
@@ -7771,7 +7775,7 @@
|
||||
@@ -7813,7 +7817,7 @@
|
||||
PY3LIBRARY=libpython3.so
|
||||
fi
|
||||
;;
|
||||
@ -37,7 +37,7 @@ diff -ruwN source/configure source-new/configure
|
||||
LDLIBRARY='libpython$(LDVERSION).so'
|
||||
BLDLIBRARY='-L. -lpython$(LDVERSION)'
|
||||
RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
|
||||
@@ -13777,7 +13781,7 @@
|
||||
@@ -14234,7 +14238,7 @@
|
||||
Emscripten*|WASI*)
|
||||
LDSHARED='$(CC) -shared'
|
||||
LDCXXSHARED='$(CXX) -shared';;
|
||||
@ -46,7 +46,7 @@ diff -ruwN source/configure source-new/configure
|
||||
LDSHARED='$(CC) -shared'
|
||||
LDCXXSHARED='$(CXX) -shared';;
|
||||
FreeBSD*)
|
||||
@@ -13862,7 +13866,7 @@
|
||||
@@ -14319,7 +14323,7 @@
|
||||
then CCSHARED="-fPIC";
|
||||
else CCSHARED="+z";
|
||||
fi;;
|
||||
@ -55,7 +55,7 @@ diff -ruwN source/configure source-new/configure
|
||||
Emscripten*|WASI*)
|
||||
if test "x$enable_wasm_dynamic_linking" = xyes
|
||||
then :
|
||||
@@ -13900,7 +13904,7 @@
|
||||
@@ -14357,7 +14361,7 @@
|
||||
LINKFORSHARED="-Wl,-E -Wl,+s";;
|
||||
# LINKFORSHARED="-Wl,-E -Wl,+s -Wl,+b\$(BINLIBDEST)/lib-dynload";;
|
||||
Linux-android*) LINKFORSHARED="-pie -Xlinker -export-dynamic";;
|
||||
@ -65,8 +65,8 @@ diff -ruwN source/configure source-new/configure
|
||||
Darwin/*|iOS/*)
|
||||
LINKFORSHARED="$extra_undefs -framework CoreFoundation"
|
||||
diff -ruwN source/Include/internal/pycore_time.h source-new/Include/internal/pycore_time.h
|
||||
--- source/Include/internal/pycore_time.h 2026-04-07 18:24:03.000000000 +0700
|
||||
+++ source-new/Include/internal/pycore_time.h 2026-05-07 12:55:06.797297037 +0700
|
||||
--- source/Include/internal/pycore_time.h 2026-10-25 16:57:51.000000000 +0000
|
||||
+++ source-new/Include/internal/pycore_time.h 2026-11-02 05:14:13.172455982 +0000
|
||||
@@ -49,6 +49,10 @@
|
||||
|
||||
#ifndef Py_INTERNAL_TIME_H
|
||||
@ -79,9 +79,9 @@ diff -ruwN source/Include/internal/pycore_time.h source-new/Include/internal/pyc
|
||||
extern "C" {
|
||||
#endif
|
||||
diff -ruwN source/Include/pyport.h source-new/Include/pyport.h
|
||||
--- source/Include/pyport.h 2026-04-07 18:24:03.000000000 +0700
|
||||
+++ source-new/Include/pyport.h 2026-05-07 12:16:56.305047939 +0700
|
||||
@@ -541,7 +541,7 @@
|
||||
--- source/Include/pyport.h 2026-10-25 16:57:51.000000000 +0000
|
||||
+++ source-new/Include/pyport.h 2026-11-02 05:14:13.173456040 +0000
|
||||
@@ -502,7 +502,7 @@
|
||||
# endif
|
||||
#endif
|
||||
|
||||
@ -91,9 +91,9 @@ diff -ruwN source/Include/pyport.h source-new/Include/pyport.h
|
||||
// See _Py_GetLocaleEncoding(), PyUnicode_DecodeLocale()
|
||||
// and PyUnicode_EncodeLocale().
|
||||
diff -ruwN source/Modules/posixmodule.c source-new/Modules/posixmodule.c
|
||||
--- source/Modules/posixmodule.c 2026-04-07 18:24:03.000000000 +0700
|
||||
+++ source-new/Modules/posixmodule.c 2026-05-07 12:57:16.208883903 +0700
|
||||
@@ -11253,7 +11253,7 @@
|
||||
--- source/Modules/posixmodule.c 2026-10-25 16:57:51.000000000 +0000
|
||||
+++ source-new/Modules/posixmodule.c 2026-11-02 05:14:13.174456099 +0000
|
||||
@@ -11340,7 +11340,7 @@
|
||||
struct tms process;
|
||||
clock_t elapsed;
|
||||
errno = 0;
|
||||
@ -103,8 +103,8 @@ diff -ruwN source/Modules/posixmodule.c source-new/Modules/posixmodule.c
|
||||
return posix_error();
|
||||
}
|
||||
diff -ruwN source/Modules/resource.c source-new/Modules/resource.c
|
||||
--- source/Modules/resource.c 2026-04-07 18:24:03.000000000 +0700
|
||||
+++ source-new/Modules/resource.c 2026-05-07 12:16:56.305184305 +0700
|
||||
--- source/Modules/resource.c 2026-10-25 16:57:51.000000000 +0000
|
||||
+++ source-new/Modules/resource.c 2026-11-02 05:14:13.174456099 +0000
|
||||
@@ -245,7 +245,7 @@
|
||||
{
|
||||
struct rlimit rl;
|
||||
|
||||
44
recipes/wip/libs/media/ffmpeg9/recipe.toml
Normal file
44
recipes/wip/libs/media/ffmpeg9/recipe.toml
Normal file
@ -0,0 +1,44 @@
|
||||
# TODO: need j1 relibc function
|
||||
[source]
|
||||
tar = "https://ffmpeg.org/releases/ffmpeg-9.0.2.tar.xz"
|
||||
patches = [
|
||||
"redox.patch"
|
||||
]
|
||||
|
||||
[build]
|
||||
template = "custom"
|
||||
dependencies = [
|
||||
"liborbital",
|
||||
"mesa",
|
||||
"sdl2",
|
||||
"zlib",
|
||||
]
|
||||
dev-dependencies = [
|
||||
"libstdcxx"
|
||||
]
|
||||
compiler = "gcc-no-lto"
|
||||
script = """
|
||||
DYNAMIC_INIT
|
||||
|
||||
export LDFLAGS="$LDFLAGS -lSDL2 -lorbital -lOSMesa"
|
||||
ARCH="${TARGET%%-*}"
|
||||
COOKBOOK_CONFIGURE_FLAGS=(
|
||||
--enable-cross-compile
|
||||
--target-os=redox
|
||||
--arch="${ARCH}"
|
||||
--cross_prefix="${TARGET}-"
|
||||
--prefix=/usr
|
||||
--disable-doc
|
||||
--enable-shared
|
||||
--disable-static
|
||||
--disable-network
|
||||
--enable-sdl2
|
||||
--enable-zlib
|
||||
--enable-pic
|
||||
--enable-encoder=png
|
||||
--enable-decoder=png
|
||||
)
|
||||
cookbook_configure
|
||||
mkdir -pv "${COOKBOOK_STAGE}/usr/share/ui/apps"
|
||||
cp -v "${COOKBOOK_RECIPE}/manifest" "${COOKBOOK_STAGE}/usr/share/ui/apps/ffplay"
|
||||
"""
|
||||
13
recipes/wip/libs/media/ffmpeg9/redox.patch
Normal file
13
recipes/wip/libs/media/ffmpeg9/redox.patch
Normal file
@ -0,0 +1,13 @@
|
||||
diff -ruwN source/configure source-new/configure
|
||||
--- source/configure 2026-08-03 22:14:47.000000000 +0000
|
||||
+++ source-new/configure 2026-11-02 10:38:23.591367435 +0000
|
||||
@@ -6377,6 +6377,9 @@
|
||||
;;
|
||||
minix)
|
||||
;;
|
||||
+ redox)
|
||||
+ enable section_data_rel_ro
|
||||
+ ;;
|
||||
none)
|
||||
;;
|
||||
*)
|
||||
Loading…
Reference in New Issue
Block a user