diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2008-06-06 13:31:04 +0000 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2008-06-06 13:31:04 +0000 |
| commit | 42a5ad04e7f786c3ad841c5112baa8801fc9ed5e (patch) | |
| tree | a261f81b01e730b65263e34873bf05f9b4db3bdb /patches/Frodo-4.1b | |
| parent | ad28cbb03f940de9316f73226c386096698f54bb (diff) | |
| download | ptxdist-42a5ad04e7f786c3ad841c5112baa8801fc9ed5e.tar.gz ptxdist-42a5ad04e7f786c3ad841c5112baa8801fc9ed5e.tar.xz | |
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@8459 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'patches/Frodo-4.1b')
| -rw-r--r-- | patches/Frodo-4.1b/generic/autoreconfig.diff | 40 | ||||
| -rw-r--r-- | patches/Frodo-4.1b/generic/enable-sdl.diff | 29 | ||||
| -rw-r--r-- | patches/Frodo-4.1b/generic/series | 2 |
3 files changed, 71 insertions, 0 deletions
diff --git a/patches/Frodo-4.1b/generic/autoreconfig.diff b/patches/Frodo-4.1b/generic/autoreconfig.diff new file mode 100644 index 000000000..252ddd44b --- /dev/null +++ b/patches/Frodo-4.1b/generic/autoreconfig.diff @@ -0,0 +1,40 @@ +--- + Src/configure | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +Index: Frodo-4.1b/Src/configure +=================================================================== +--- Frodo-4.1b.orig/Src/configure ++++ Frodo-4.1b/Src/configure +@@ -1,4 +1,4 @@ +-#! /bin/sh ++x#! /bin/sh + # Guess values for system-dependent variables and create Makefiles. + # Generated by Autoconf 2.52d. + # +@@ -6806,6 +6806,12 @@ echo "${ECHO_T}SVGAlib" >&6 + TARGET=svgalib + CFLAGS="$CFLAGS -D__svgalib__" + LIBS="$LIBS -lvga" ++ elif [ x"$HAVE_SDL" = "xyes" ]; then ++ echo "$as_me:6817: result: SDL" >&5 ++ echo "${ECHO_T}SDL" >&6 ++ TARGET=sdl ++ CFLAGS="$CFLAGS $SDL_CFLAGS -DHAVE_SDL" ++ LIBS="$LIBS $SDL_LIBS" + else + echo "$as_me:6810: result: Ummm..." >&5 + echo "${ECHO_T}Ummm..." >&6 +@@ -6813,12 +6819,6 @@ echo "${ECHO_T}Ummm..." >&6 + echo "$as_me: error: Neither X nor SVGAlib found, don't know what target to use." >&2;} + { (exit 1); exit 1; }; } + fi +-elif [ x"$HAVE_SDL" = "xyes" ]; then +- echo "$as_me:6817: result: SDL" >&5 +-echo "${ECHO_T}SDL" >&6 +- TARGET=sdl +- CFLAGS="$CFLAGS $SDL_CFLAGS -DHAVE_SDL" +- LIBS="$LIBS $SDL_LIBS" + else + echo "$as_me:6823: result: X Window System" >&5 + echo "${ECHO_T}X Window System" >&6 diff --git a/patches/Frodo-4.1b/generic/enable-sdl.diff b/patches/Frodo-4.1b/generic/enable-sdl.diff new file mode 100644 index 000000000..fbefcb40c --- /dev/null +++ b/patches/Frodo-4.1b/generic/enable-sdl.diff @@ -0,0 +1,29 @@ +--- + Src/configure.in | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +Index: Frodo-4.1b/Src/configure.in +=================================================================== +--- Frodo-4.1b.orig/Src/configure.in ++++ Frodo-4.1b/Src/configure.in +@@ -80,15 +80,15 @@ elif [[ x"$no_x" = "xyes" ]]; then + TARGET=svgalib + CFLAGS="$CFLAGS -D__svgalib__" + LIBS="$LIBS -lvga" ++ elif [[ x"$HAVE_SDL" = "xyes" ]]; then ++ AC_MSG_RESULT([SDL]) ++ TARGET=sdl ++ CFLAGS="$CFLAGS $SDL_CFLAGS -DHAVE_SDL" ++ LIBS="$LIBS $SDL_LIBS" + else + AC_MSG_RESULT([Ummm...]) + AC_MSG_ERROR([Neither X nor SVGAlib found, don't know what target to use.]) + fi +-elif [[ x"$HAVE_SDL" = "xyes" ]]; then +- AC_MSG_RESULT([SDL]) +- TARGET=sdl +- CFLAGS="$CFLAGS $SDL_CFLAGS -DHAVE_SDL" +- LIBS="$LIBS $SDL_LIBS" + else + AC_MSG_RESULT([X Window System]) + TARGET=x11 diff --git a/patches/Frodo-4.1b/generic/series b/patches/Frodo-4.1b/generic/series new file mode 100644 index 000000000..2e2419948 --- /dev/null +++ b/patches/Frodo-4.1b/generic/series @@ -0,0 +1,2 @@ +enable-sdl.diff +autoreconfig.diff |