Attachment #400088 for bug #545002

Lines 191-197 Link Here

(-)xbmc-14.1-Helix.orig/Makefile.in (-2 / +1 lines)
191	PAPCODECS_DIRS= \	191	PAPCODECS_DIRS= \
192	lib/nosefart \	192	lib/nosefart \
193	lib/timidity \	193	lib/timidity \
194	lib/libsidplay2 \
195	lib/stsound/StSoundLibrary \	194	lib/stsound/StSoundLibrary \
196	lib/snesapu/SNES/SNESAPU \	195	lib/snesapu/SNES/SNESAPU \
197	lib/vgmstream	196	lib/vgmstream
Lines 433-439 Link Here
433	$(MAKE) -C lib/timidity	432	$(MAKE) -C lib/timidity
434	$(MAKE) -C lib/nosefart	433	$(MAKE) -C lib/nosefart
435	ifneq ($(findstring arm-osx,@ARCH@), arm-osx)	434	ifneq ($(findstring arm-osx,@ARCH@), arm-osx)
436	$(MAKE) -C lib/libsidplay2	435	# $(MAKE) -C lib/libsidplay2
437	endif	436	endif
438	ifeq (@USE_ASAP_CODEC@,1)	437	ifeq (@USE_ASAP_CODEC@,1)
439	ifneq ($(findstring osx,@ARCH@), osx)	438	ifneq ($(findstring osx,@ARCH@), osx)

Lines 1152-1157 Link Here

(-)xbmc-14.1-Helix.orig/configure.in (-1 / +4 lines)
1152	PKG_CHECK_MODULES([TAGLIB], [taglib >= 1.8],	1152	PKG_CHECK_MODULES([TAGLIB], [taglib >= 1.8],
1153	[INCLUDES="$INCLUDES $TAGLIB_CFLAGS"; LIBS="$LIBS $TAGLIB_LIBS"],	1153	[INCLUDES="$INCLUDES $TAGLIB_CFLAGS"; LIBS="$LIBS $TAGLIB_LIBS"],
1154	AC_MSG_ERROR($missing_library))	1154	AC_MSG_ERROR($missing_library))
		1155	PKG_CHECK_MODULES([SIDPLAY], [libsidplay2],
		1156	[INCLUDES="$INCLUDES $SIDPLAY_CFLAGS"; LIBS="$LIBS $SIDPLAY_LIBS"],
		1157	AC_MSG_ERROR($missing_library))
1155		1158
1156	if test "$use_optical_drive" = "yes"; then	1159	if test "$use_optical_drive" = "yes"; then
1157	PKG_CHECK_MODULES([CDIO], [libcdio],	1160	PKG_CHECK_MODULES([CDIO], [libcdio],
Lines 1243-1248 Link Here
1243	XB_FIND_SONAME([MODPLUG], [modplug])	1246	XB_FIND_SONAME([MODPLUG], [modplug])
1244	XB_FIND_SONAME([ASS], [ass])	1247	XB_FIND_SONAME([ASS], [ass])
1245	XB_FIND_SONAME([MPEG2], [mpeg2])	1248	XB_FIND_SONAME([MPEG2], [mpeg2])
		1249	XB_FIND_SONAME([SIDPLAY2], [sidplay2])
1246		1250
1247	# WebServer	1251	# WebServer
1248	if test "$use_webserver" = "yes"; then	1252	if test "$use_webserver" = "yes"; then
Lines 2448-2454 Link Here
2448	lib/timidity/Makefile \	2452	lib/timidity/Makefile \
2449	lib/asap/Makefile \	2453	lib/asap/Makefile \
2450	lib/nosefart/Makefile \	2454	lib/nosefart/Makefile \
2451	lib/libsidplay2/Makefile \
2452	lib/vgmstream/Makefile \	2455	lib/vgmstream/Makefile \
2453	lib/snesapu/SNES/SNESAPU/Makefile \	2456	lib/snesapu/SNES/SNESAPU/Makefile \
2454	lib/stsound/StSoundLibrary/Makefile \	2457	lib/stsound/StSoundLibrary/Makefile \

Lines 54-60 Link Here

(-)xbmc-14.1-Helix.orig/xbmc/DllPaths_generated.h.in (-1 / +1 lines)
54	#define DLL_PATH_MODULE_CODEC "special://xbmcbin/system/players/paplayer/dumb-@ARCH@.so"	54	#define DLL_PATH_MODULE_CODEC "special://xbmcbin/system/players/paplayer/dumb-@ARCH@.so"
55	#define DLL_PATH_MPC_CODEC "special://xbmcbin/system/players/paplayer/libmpcdec-@ARCH@.so"	55	#define DLL_PATH_MPC_CODEC "special://xbmcbin/system/players/paplayer/libmpcdec-@ARCH@.so"
56	#define DLL_PATH_NSF_CODEC "special://xbmcbin/system/players/paplayer/nosefart-@ARCH@.so"	56	#define DLL_PATH_NSF_CODEC "special://xbmcbin/system/players/paplayer/nosefart-@ARCH@.so"
57	#define DLL_PATH_SID_CODEC "special://xbmcbin/system/players/paplayer/libsidplay2-@ARCH@.so"	57	#define DLL_PATH_SID_CODEC "@SIDPLAY2_SONAME@"
58	#define DLL_PATH_SPC_CODEC "special://xbmcbin/system/players/paplayer/SNESAPU-@ARCH@.so"	58	#define DLL_PATH_SPC_CODEC "special://xbmcbin/system/players/paplayer/SNESAPU-@ARCH@.so"
59	#define DLL_PATH_VGM_CODEC "special://xbmcbin/system/players/paplayer/vgmstream-@ARCH@.so"	59	#define DLL_PATH_VGM_CODEC "special://xbmcbin/system/players/paplayer/vgmstream-@ARCH@.so"
60	#define DLL_PATH_WAVPACK_CODEC "@WAVPACK_SONAME@"	60	#define DLL_PATH_WAVPACK_CODEC "@WAVPACK_SONAME@"

Return to bug 545002