Attachment #400348 for bug #545002

Lines 1206-1214 Link Here

(-)xbmc-14.1-Helix.orig/configure.in (-3 lines)
1206	AC_DEFINE([SDL_VERSION],[1],["SDL major version"])	1206	AC_DEFINE([SDL_VERSION],[1],["SDL major version"])
1207	fi	1207	fi
1208	else	1208	else
1209	if test "$target_platform" != "target_android" ; then
1210	AC_CHECK_LIB([jasper], [main],, AC_MSG_ERROR($missing_library)) # check for cximage
1211	fi
1212	if test "x$use_alsa" != "xno"; then	1209	if test "x$use_alsa" != "xno"; then
1213	PKG_CHECK_MODULES([ALSA], [alsa],	1210	PKG_CHECK_MODULES([ALSA], [alsa],
1214	[INCLUDES="$INCLUDES $ALSA_CFLAGS"; LIBS="$LIBS $ALSA_LIBS"; use_alsa=yes],	1211	[INCLUDES="$INCLUDES $ALSA_CFLAGS"; LIBS="$LIBS $ALSA_LIBS"; use_alsa=yes],

Lines 4-11 Link Here

(-)xbmc-14.1-Helix.orig/lib/cximage-6.0/Makefile.in (-3 / +3 lines)
4	ARCHIVE=$(SO:.so=.a)	4	ARCHIVE=$(SO:.so=.a)
5	SYSDIR=../../system	5	SYSDIR=../../system
6	SLIB=$(SYSDIR)/$(SO)	6	SLIB=$(SYSDIR)/$(SO)
7	DIRS=CxImage raw jbig	7	DIRS=CxImage raw
8	SLIBS=CxImage/cximage.a raw/raw.a jbig/jbig.a	8	SLIBS=CxImage/cximage.a raw/raw.a
9		9
10	ifeq ($(findstring osx,$(ARCH)), osx)	10	ifeq ($(findstring osx,$(ARCH)), osx)
11	export ARCH	11	export ARCH
Lines 21-27 Link Here
21	CxImage/.o jasper//.o jbig/.o raw/*.o	21	CxImage/.o jasper//.o jbig/.o raw/*.o
22	else	22	else
23	$(CXX) $(CFLAGS) $(LDFLAGS) -shared -o $(SLIB) -Wl,--whole-archive $(SLIBS) \	23	$(CXX) $(CFLAGS) $(LDFLAGS) -shared -o $(SLIB) -Wl,--whole-archive $(SLIBS) \
24	-Wl,--no-whole-archive -lpng -ljasper -ljpeg -ltiff -lz -Wl,--unresolved-symbols=ignore-all	24	-Wl,--no-whole-archive -lpng -ljpeg -ltiff -lz -Wl,--unresolved-symbols=ignore-all
25	endif	25	endif
26		26
27	$(SLIBS): compile	27	$(SLIBS): compile

Return to bug 545002