diff options
| author | Tony Theodore <tonyt@logyst.com> | 2017-11-18 08:44:18 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2017-11-19 00:29:22 (GMT) |
| commit | cd1655c9ef429d8e3720e774f8af97c4cb380bd7 (patch) | |
| tree | 37f93f8c105fbe72c6b76553f33821a0d22c82de /src/libcaca-1-fixes.patch | |
| parent | 628590f62de2b42c5296a6e9d82acf13188db682 (diff) | |
| download | mxe-cd1655c9ef429d8e3720e774f8af97c4cb380bd7.zip mxe-cd1655c9ef429d8e3720e774f8af97c4cb380bd7.tar.gz mxe-cd1655c9ef429d8e3720e774f8af97c4cb380bd7.tar.bz2 | |
various packages: refresh patches
brings patches into common format to reduce noise in diffs
Diffstat (limited to 'src/libcaca-1-fixes.patch')
| -rw-r--r-- | src/libcaca-1-fixes.patch | 33 |
1 files changed, 13 insertions, 20 deletions
diff --git a/src/libcaca-1-fixes.patch b/src/libcaca-1-fixes.patch index a363133..bdbade8 100644 --- a/src/libcaca-1-fixes.patch +++ b/src/libcaca-1-fixes.patch @@ -1,14 +1,16 @@ This file is part of MXE. See LICENSE.md for licensing information. -From b9f723cf31e007004ccc748a0e16c594fa7fdf35 Mon Sep 17 00:00:00 2001 +Contains ad hoc patches for cross building. + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Timothy Gu <timothygu99@gmail.com> Date: Sat, 2 Aug 2014 15:12:50 -0700 -Subject: [PATCH 1/3] Fix Windows build for ncurses and slang +Subject: [PATCH] Fix Windows build for ncurses and slang Signed-off-by: Timothy Gu <timothygu99@gmail.com> diff --git a/caca/driver/ncurses.c b/caca/driver/ncurses.c -index 7171e91..8161c0f 100644 +index 1111111..2222222 100644 --- a/caca/driver/ncurses.c +++ b/caca/driver/ncurses.c @@ -187,7 +187,7 @@ @@ -50,7 +52,7 @@ index 7171e91..8161c0f 100644 { sigwinch_d->resize.resized = 1; diff --git a/caca/driver/slang.c b/caca/driver/slang.c -index 9714956..4dd9fb6 100644 +index 1111111..2222222 100644 --- a/caca/driver/slang.c +++ b/caca/driver/slang.c @@ -131,7 +131,7 @@ static int slang_init_graphics(caca_display_t *dp) @@ -71,19 +73,16 @@ index 9714956..4dd9fb6 100644 static RETSIGTYPE sigwinch_handler(int sig) { sigwinch_d->resize.resized = 1; --- -1.8.3.2 - -From 0313fb009eca09481d216938db989db9f50672ee Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Timothy Gu <timothygu99@gmail.com> Date: Sun, 3 Aug 2014 10:56:02 -0700 -Subject: [PATCH 2/3] Fix pkg-config file and caca-config script +Subject: [PATCH] Fix pkg-config file and caca-config script Signed-off-by: Timothy Gu <timothygu99@gmail.com> diff --git a/caca-config.in b/caca-config.in -index a54e6e1..f48d9de 100644 +index 1111111..2222222 100644 --- a/caca-config.in +++ b/caca-config.in @@ -67,7 +67,7 @@ do @@ -96,7 +95,7 @@ index a54e6e1..f48d9de 100644 *) usage 1 1>&2 diff --git a/caca/caca.pc.in b/caca/caca.pc.in -index fa683fb..6e50668 100644 +index 1111111..2222222 100644 --- a/caca/caca.pc.in +++ b/caca/caca.pc.in @@ -9,5 +9,5 @@ Version: @VERSION@ @@ -106,19 +105,16 @@ index fa683fb..6e50668 100644 -Libs.private: @ZLIB_LIBS@ +Libs.private: @ZLIB_LIBS@ @CACA_LIBS@ Cflags: -I${includedir} --- -1.8.3.2 - -From 50e5c99690c593cc974a49ae21af8fca288bc854 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Timothy Gu <timothygu99@gmail.com> Date: Sun, 3 Aug 2014 11:13:23 -0700 -Subject: [PATCH 3/3] Fix freeglut detection on Windows +Subject: [PATCH] Fix freeglut detection on Windows Signed-off-by: Timothy Gu <timothygu99@gmail.com> diff --git a/configure.ac b/configure.ac -index 641dd17..3ce7057 100644 +index 1111111..2222222 100644 --- a/configure.ac +++ b/configure.ac @@ -232,22 +232,83 @@ fi @@ -218,6 +214,3 @@ index 641dd17..3ce7057 100644 fi PKG_CHECK_MODULES(FTGL, ftgl >= 2.1.3, [FTGL="yes"], [FTGL="no"]) fi --- -1.8.3.2 - |