Merge branch 'master' of https://github.com/redox-os/cookbook

2026-06-27 07:14:18 +08:00 · 2018-04-26 20:34:07 -06:00 · 2018-04-26 20:34:07 -06:00 · ba9a6c39ae
commit ba9a6c39ae
parent e0f9a624ab 02e481e029
6 changed files with 172 additions and 10 deletions
--- a/recipes/ncdu/recipe.sh
+++ b/recipes/ncdu/recipe.sh
@ -0,0 +1,43 @@
+VERSION=1.13
+TAR=https://dev.yorhel.nl/download/ncdu-$VERSION.tar.gz
+BUILD_DEPENDS=(ncurses)
+DEPENDS=(terminfo)
+
+function recipe_version {
+    echo "$VERSION"
+    skip=1
+}
+function recipe_update {
+    echo "skipping update"
+    skip=1
+}
+function recipe_build {
+    sysroot="$PWD/../sysroot"
+    export LDFLAGS="-L$sysroot/lib"
+    export CPPFLAGS="-I$sysroot/include -I$sysroot/include/ncurses"
+    ./configure \
+        --build x86_64-pc-linux-gnu \
+        --host "$HOST"
+    make
+    skip=1
+}
+function recipe_test {
+    echo "skipping test"
+    skip=1
+}
+function recipe_clean {
+    make clean
+    skip=1
+}
+function recipe_stage {
+    dest="$(realpath "$1")"
+    make DESTDIR="$dest" install
+    cd "$dest/usr/local/bin/"
+    find . -type f -exec install -D "{}" "$dest/usr/bin/{}" \;
+    cd -
+    cd "$dest/usr/local/share/"
+    find . -type f -exec install -D "{}" "$dest/share/{}" \;
+    cd -
+    rm -r "$dest/usr/local/"
+    skip=1
+}
--- a/recipes/powerline/recipe.sh
+++ b/recipes/powerline/recipe.sh
@ -0,0 +1,2 @@
+GIT=https://github.com/jD91mZM2/powerline-rs
+CARGOFLAGS="--no-default-features --features chrono"
--- a/recipes/prboom/01_redox.patch
+++ b/recipes/prboom/01_redox.patch
@ -1,22 +1,22 @@
-diff -rupN prboom-2.5.0/configure.ac prboom-2.5.0-redox/configure.ac
--- prboom-2.5.0/configure.ac	2008-11-09 11:12:37.000000000 -0800
-+++ prboom-2.5.0-redox/configure.ac	2017-10-14 23:27:16.000000000 -0700
+diff -burpN source-original/configure.ac source/configure.ac
+--- source-original/configure.ac	2008-11-09 20:12:37.000000000 +0100
+++ source/configure.ac	2018-04-22 23:41:16.945896818 +0200
@@ -85,8 +85,6 @@ if test "$cross_compiling" != "yes"; the
 fi
-
+ 
 dnl --- Header files, typedefs, structures
 -AC_TYPE_UID_T
 -AC_TYPE_SIZE_T
 AC_DECL_SYS_SIGLIST
 AC_HEADER_SYS_WAIT
 AC_CHECK_HEADERS(unistd.h asm/byteorder.h sched.h)
-diff -rupN prboom-2.5.0/src/d_deh.c prboom-2.5.0-redox/src/d_deh.c
--- prboom-2.5.0/src/d_deh.c	2008-10-11 05:10:38.000000000 -0700
-+++ prboom-2.5.0-redox/src/d_deh.c	2017-10-14 23:29:00.000000000 -0700
+diff -burpN source-original/src/d_deh.c source/src/d_deh.c
+--- source-original/src/d_deh.c	2008-10-11 14:10:38.000000000 +0200
+++ source/src/d_deh.c	2018-04-22 23:41:16.949896859 +0200
@@ -54,17 +54,6 @@
 #define TRUE 1
 #define FALSE 0
-
+ 
 -#ifndef HAVE_STRLWR
 -#include <ctype.h>
 -
@ -30,3 +30,28 @@ diff -rupN prboom-2.5.0/src/d_deh.c prboom-2.5.0-redox/src/d_deh.c
 -
 // killough 10/98: new functions, to allow processing DEH files in-memory
 // (e.g. from wads)
+ 
+diff -burpN source-original/src/SDL/i_video.c source/src/SDL/i_video.c
+--- source-original/src/SDL/i_video.c	2008-10-18 15:32:29.000000000 +0200
+++ source/src/SDL/i_video.c	2018-04-23 00:51:18.944949507 +0200
+@@ -407,7 +407,7 @@ void I_FinishUpdate (void)
+     I_UploadNewPalette(newpal);
+     newpal = NO_PALETTE_CHANGE;
+   }
+-  SDL_Flip(screen);
+  SDL_UpdateRect(screen, 0, 0, screen->w, screen->h);
+ }
+ 
+ //
+diff -burpN source-original/src/v_video.c source/src/v_video.c
+--- source-original/src/v_video.c	2008-10-11 14:10:41.000000000 +0200
+++ source/src/v_video.c	2018-04-22 23:43:10.939034965 +0200
+@@ -558,7 +558,7 @@ void V_UpdateTrueColorPalette(video_mode
+             ng = (int)(g*t+roundUpG);
+             nb = (int)(b*t+roundUpB);
+             Palettes32[((p*256+i)*VID_NUMCOLORWEIGHTS)+w] = (
+-              (nr<<16) | (ng<<8) | nb
+              (255<<24) | (nr<<16) | (ng<<8) | nb
+             );
+           }
+         }
--- a/recipes/sdl/02_timers.patch
+++ b/recipes/sdl/02_timers.patch
@ -0,0 +1,57 @@
+diff -rupN source/src/timer/unix/SDL_systimer.c source-redox/src/timer/unix/SDL_systimer.c
+--- source/src/timer/unix/SDL_systimer.c	2012-01-19 07:30:06.000000000 +0100
+++ source-redox/src/timer/unix/SDL_systimer.c	2018-04-22 17:42:17.455342646 +0200
+@@ -150,14 +150,14 @@ static void HandleAlarm(int sig)
+ 
+ int SDL_SYS_TimerInit(void)
+ {
+-	struct sigaction action;
+	//struct sigaction action;
+ 
+-	/* Set the alarm handler (Linux specific) */
+-	SDL_memset(&action, 0, sizeof(action));
+-	action.sa_handler = HandleAlarm;
+-	action.sa_flags = SA_RESTART;
+-	sigemptyset(&action.sa_mask);
+-	sigaction(SIGALRM, &action, NULL);
+	///* Set the alarm handler (Linux specific) */
+	//SDL_memset(&action, 0, sizeof(action));
+	//action.sa_handler = HandleAlarm;
+	//action.sa_flags = SA_RESTART;
+	//sigemptyset(&action.sa_mask);
+	//sigaction(SIGALRM, &action, NULL);
+ 	return(0);
+ }
+ 
+@@ -168,22 +168,22 @@ void SDL_SYS_TimerQuit(void)
+ 
+ int SDL_SYS_StartTimer(void)
+ {
+-	struct itimerval timer;
+	//struct itimerval timer;
+ 
+-	timer.it_value.tv_sec = (SDL_alarm_interval/1000);
+-	timer.it_value.tv_usec = (SDL_alarm_interval%1000)*1000;
+-	timer.it_interval.tv_sec = (SDL_alarm_interval/1000);
+-	timer.it_interval.tv_usec = (SDL_alarm_interval%1000)*1000;
+-	setitimer(ITIMER_REAL, &timer, NULL);
+	//timer.it_value.tv_sec = (SDL_alarm_interval/1000);
+	//timer.it_value.tv_usec = (SDL_alarm_interval%1000)*1000;
+	//timer.it_interval.tv_sec = (SDL_alarm_interval/1000);
+	//timer.it_interval.tv_usec = (SDL_alarm_interval%1000)*1000;
+	//setitimer(ITIMER_REAL, &timer, NULL);
+ 	return(0);
+ }
+ 
+ void SDL_SYS_StopTimer(void)
+ {
+-	struct itimerval timer;
+	//struct itimerval timer;
+ 
+-	SDL_memset(&timer, 0, (sizeof timer));
+-	setitimer(ITIMER_REAL, &timer, NULL);
+	//SDL_memset(&timer, 0, (sizeof timer));
+	//setitimer(ITIMER_REAL, &timer, NULL);
+ }
+ 
+ #else /* USE_ITIMER */
--- a/recipes/sdl/recipe.sh
+++ b/recipes/sdl/recipe.sh
@ -13,8 +13,8 @@ function recipe_update {

 function recipe_build {
    ./autogen.sh
-    ./configure --prefix=/ --host=${HOST} --disable-shared --disable-pulseaudio --disable-video-x11 --disable-cdrom --disable-loadso --disable-threads --disable-timers --enable-audio --enable-dummyaudio --enable-video-orbital
-    make 
+    ./configure --prefix=/ --host=${HOST} --disable-shared --disable-pulseaudio --disable-video-x11 --disable-cdrom --disable-loadso --disable-threads --enable-audio --enable-dummyaudio --enable-video-orbital
+    make
    skip=1
 }

--- a/recipes/ttf-hack/recipe.sh
+++ b/recipes/ttf-hack/recipe.sh
@ -0,0 +1,35 @@
+VERSION=3.003
+TAR="https://github.com/source-foundry/Hack/releases/download/v$VERSION/Hack-v$VERSION-ttf.tar.xz"
+
+function recipe_version {
+    echo "$VERSION"
+    skip=1
+}
+
+function recipe_update {
+    echo "skipping update"
+    skip=1
+}
+
+function recipe_build {
+    echo "skipping build"
+    skip=1
+}
+
+function recipe_test {
+    echo "skipping test"
+    skip=1
+}
+
+function recipe_clean {
+    echo "skipping clean"
+    skip=1
+}
+
+function recipe_stage {
+    dest="$(realpath "$1")"
+    for file in *.ttf; do
+        install -D -m 644 "$file" "$dest/ui/fonts/Mono/Hack/$file"
+    done
+    skip=1
+}