diff options
Diffstat (limited to 'source/xap/xine-ui')
| -rw-r--r-- | source/xap/xine-ui/02_FTBFS.diff | 63 | ||||
| -rwxr-xr-x | source/xap/xine-ui/xine-ui.SlackBuild | 6 |
2 files changed, 68 insertions, 1 deletions
diff --git a/source/xap/xine-ui/02_FTBFS.diff b/source/xap/xine-ui/02_FTBFS.diff new file mode 100644 index 000000000..0e30f94a4 --- /dev/null +++ b/source/xap/xine-ui/02_FTBFS.diff @@ -0,0 +1,63 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -91,6 +91,7 @@ PKG_CHECK_MODULES([XINE], [libxine >= 1. + XINE_LIB_SHIMS + XINE_LIB_OPEN_CLOEXEC + XINE_LIB_SOCKET_CLOEXEC ++XINE_LIB_LIST_NEXT_VALUE + + CFLAGS="${CFLAGS} ${XINE_CFLAGS}" + +--- a/m4/_xine.m4 ++++ b/m4/_xine.m4 +@@ -241,3 +241,21 @@ AC_DEFUN([XINE_LIB_SOCKET_CLOEXEC], + LIBS="$tmp_LIBS" + ]) + ++dnl Test for xine_list_next_value function ++AC_DEFUN([XINE_LIB_LIST_NEXT_VALUE], ++ [AC_MSG_CHECKING([for xine_list_next_value within xine-lib]) ++ tmp_CFLAGS="$CFLAGS" ++ tmp_LIBS="$LIBS" ++ CFLAGS="$CFLAGS $XINE_CFLAGS" ++ LIBS="$LIBS $XINE_LIBS" ++ AC_LINK_IFELSE( ++ [AC_LANG_PROGRAM([ ++ ],[ ++xine_list_next_value (); ++ ])], ++ [AC_DEFINE([HAVE_XINE_LIST_NEXT_VALUE], [1], [Define if xine-lib supports xine_list_next_value]) ++ AC_MSG_RESULT([yes])], ++ [AC_MSG_RESULT([no])]) ++ CFLAGS="$tmp_CFLAGS" ++ LIBS="$tmp_LIBS" ++ ]) +--- a/src/xitk/setup.c ++++ b/src/xitk/setup.c +@@ -32,6 +32,17 @@ + + #include <xine/list.h> + ++#ifdef HAVE_XINE_LIST_NEXT_VALUE ++# define _xine_list_next_value(_xlnv_list,_xlnv_ite) xine_list_next_value (_xlnv_list, _xlnv_ite) ++#else ++static inline void *_xine_list_next_value (xine_list_t *list, xine_list_iterator_t *ite) { ++ if (*ite) ++ *ite = xine_list_next (list, *ite); ++ else ++ *ite = xine_list_front (list); ++ return *ite ? xine_list_get_value (list, *ite) : NULL; ++} ++#endif + + #define WINDOW_WIDTH 630 + #define WINDOW_HEIGHT 530 +@@ -809,7 +820,7 @@ static void setup_change_section(xitk_wi + xitk_widget_t *sw; + xine_list_iterator_t ite = NULL; + while (1) { +- sw = xine_list_next_value (setup->widgets, &ite); ++ sw = _xine_list_next_value (setup->widgets, &ite); + if (!ite) + break; + xitk_destroy_widget (sw); diff --git a/source/xap/xine-ui/xine-ui.SlackBuild b/source/xap/xine-ui/xine-ui.SlackBuild index 4ec9ee506..3f3c366a3 100755 --- a/source/xap/xine-ui/xine-ui.SlackBuild +++ b/source/xap/xine-ui/xine-ui.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=xine-ui VERSION=${VERSION:-$(echo xine-ui-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} # I would use "-march=i586 -mcpu=i686" here as usual, but with XINE it's all or nothing. # I'd rather have it work well for the i686/Athlon crowd than suck for everyone. -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -60,6 +60,10 @@ rm -rf xine-ui-$VERSION tar xvf $CWD/xine-ui-$VERSION.tar.?z || exit 1 cd xine-ui-$VERSION || exit 1 +# Fix missing function: +zcat $CWD/02_FTBFS.diff.gz | patch -p1 --verbose || exit 1 +autoreconf -vif + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ |