Attachment #400082 for bug #545002




BOOTSTRAP_SUBDIRS += lib/libdvd/libdvdcss/configure.ac
DVD_CSS=lib/libdvd/libdvdcss/configure
endif
BOOTSTRAP_SUBDIRS += lib/libdvd/libdvdread/configure.ac
BOOTSTRAP_SUBDIRS += lib/libdvd/libdvdnav/configure.ac

ifneq ($(wildcard pvr-addons/Makefile.am),)

BOOTSTRAP_TARGETS=$(basename $(BOOTSTRAP_SUBDIRS))
all: $(BOOTSTRAP_TARGETS)

#preserve order for libdvd. dvdcss (if present) -> dvdread -> dvdnav.
lib/libdvd/libdvdread/configure: $(DVD_CSS)
lib/libdvd/libdvdnav/configure: lib/libdvd/libdvdread/configure

%: %.ac
	autoreconf -vif $(@D)
	-@rm -rf $(@D)/autom4te.cache




PKG_CHECK_MODULES([SIDPLAY],  [libsidplay2],
  [INCLUDES="$INCLUDES $SIDPLAY_CFLAGS"; LIBS="$LIBS $SIDPLAY_LIBS"],
  AC_MSG_ERROR($missing_library))
PKG_CHECK_MODULES([DVDREAD],  [dvdread],
  [INCLUDES="$INCLUDES $DVDREAD_CFLAGS"; LIBS="$LIBS $DVDREAD_LIBS"],
  AC_MSG_ERROR($missing_library))

if test "$use_optical_drive" = "yes"; then
  PKG_CHECK_MODULES([CDIO],       [libcdio],

    --with-pic
], [$SKIP_CONFIG_DVDCSS])

XB_CONFIG_MODULE([lib/libdvd/libdvdread], [
  ./configure2 \
    --extra-cflags="$CFLAGS $DVDREAD_CFLAGS -I`pwd`/../libdvdcss/src $DROID_DVDLIB_SEEK64" \
    --prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \
    --host=$host_alias \
    --build=$build_alias \
    --target=$target_alias \      
    --enable-static \
    --disable-shared \
    --disable-strip \
    --disable-opts \
    --cc="$CC" &&
  mkdir -p `pwd`/../includes/dvdread
  cp `pwd`/../libdvdread/src/*.h `pwd`/../includes/dvdread
  cp `pwd`/../libdvdread/src/dvdread/*.h `pwd`/../includes/dvdread
], [0])

XB_CONFIG_MODULE([lib/libdvd/libdvdnav], [
  ./configure2 \
    --extra-cflags="$CFLAGS $DVDREAD_CFLAGS -I`pwd`/../includes $DROID_DVDLIB_SEEK64" \
    --extra-ldflags="-L`pwd`/../libdvdread/obj" \
    --with-dvdread-config="`pwd`/../dvdread-config" \
    --prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \
    --host=$host_alias \





SYSDIR=@abs_top_srcdir@/system/players/dvdplayer
SOS= libdvdnav-$(ARCH).so
DIRS=	libdvdnav
	libdvdnav

WRAPPER=@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o
WRAPPER_MACH_ALIAS=@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias

	$(CC) $(LDFLAGS) -Wl,-alias_list,$(WRAPPER_MACH_ALIAS) -o $@ \
		$(WRAPPER) libdvdcss/src/*.o $(BUNDLE1_O)

$(SYSDIR)/libdvdnav-$(ARCH).so: $($(WRAPPER)) $(DVDCSS_A) libdvdnav/obj/libdvdnav.a
	$(CC) $(LDFLAGS) -Wl,-alias_list,$(WRAPPER_MACH_ALIAS) -o $@ \
		$(WRAPPER) $(DVDCSS_O) libdvdnav/obj/*.o $(BUNDLE1_O)

else


		libdvdcss/src/*.o -Wl,--unresolved-symbols=ignore-all -lm \
		`cat $(WRAPPER:.o=.def)` $(WRAPPER)

$(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER) $(DVDCSS_A) libdvdnav/obj/libdvdnav.a
	$(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ $(DVDCSS_O) libdvdnav/obj/*.o -lm \
		-Wl,--unresolved-symbols=ignore-all \
		`cat $(WRAPPER:.o=.def)` $(WRAPPER) -ldvdread

endif


libdvdcss: compile
	$(MAKE) -C $@

libdvdread/obj/libdvdread.a: libdvdread;
libdvdread: compile
	$(MAKE) -C $@

libdvdnav/obj/libdvdnav.a: libdvdnav;
libdvdnav: compile
	$(MAKE) -C $@

Lines 34-39 Link Here

(-)xbmc-14.1-Helix.orig/xbmc/cores/dvdplayer/DVDInputStreams/DllDvdNav.h (+2 lines)
34	#define HAVE_CONFIG_H	34	#define HAVE_CONFIG_H
35	#endif	35	#endif
36		36
		37	// pull in Kodi's config h instead of dvdnav's one
		38	#include "xbmc/config.h"
37	#include "dvdnav/dvdnav_internal.h"	39	#include "dvdnav/dvdnav_internal.h"
38	#include "dvdnav/vm.h"	40	#include "dvdnav/vm.h"
39	#include "dvdnav/dvd_types.h"	41	#include "dvdnav/dvd_types.h"

Return to bug 545002

Lines 8-14 Link Here

(-)xbmc-14.1-Helix.orig/bootstrap.mk (-5 lines)
8	BOOTSTRAP_SUBDIRS += lib/libdvd/libdvdcss/configure.ac	8	BOOTSTRAP_SUBDIRS += lib/libdvd/libdvdcss/configure.ac
9	DVD_CSS=lib/libdvd/libdvdcss/configure	9	DVD_CSS=lib/libdvd/libdvdcss/configure
10	endif	10	endif
11	BOOTSTRAP_SUBDIRS += lib/libdvd/libdvdread/configure.ac
12	BOOTSTRAP_SUBDIRS += lib/libdvd/libdvdnav/configure.ac	11	BOOTSTRAP_SUBDIRS += lib/libdvd/libdvdnav/configure.ac
13		12
14	ifneq ($(wildcard pvr-addons/Makefile.am),)	13	ifneq ($(wildcard pvr-addons/Makefile.am),)
Lines 18-27 Link Here
18	BOOTSTRAP_TARGETS=$(basename $(BOOTSTRAP_SUBDIRS))	17	BOOTSTRAP_TARGETS=$(basename $(BOOTSTRAP_SUBDIRS))
19	all: $(BOOTSTRAP_TARGETS)	18	all: $(BOOTSTRAP_TARGETS)
20		19
21	#preserve order for libdvd. dvdcss (if present) -> dvdread -> dvdnav.
22	lib/libdvd/libdvdread/configure: $(DVD_CSS)
23	lib/libdvd/libdvdnav/configure: lib/libdvd/libdvdread/configure
24
25	%: %.ac	20	%: %.ac
26	autoreconf -vif $(@D)	21	autoreconf -vif $(@D)
27	-@rm -rf $(@D)/autom4te.cache	22	-@rm -rf $(@D)/autom4te.cache

Lines 1155-1160 Link Here

(-)xbmc-14.1-Helix.orig/configure.in (-18 / +3 lines)
1155	PKG_CHECK_MODULES([SIDPLAY], [libsidplay2],	1155	PKG_CHECK_MODULES([SIDPLAY], [libsidplay2],
1156	[INCLUDES="$INCLUDES $SIDPLAY_CFLAGS"; LIBS="$LIBS $SIDPLAY_LIBS"],	1156	[INCLUDES="$INCLUDES $SIDPLAY_CFLAGS"; LIBS="$LIBS $SIDPLAY_LIBS"],
1157	AC_MSG_ERROR($missing_library))	1157	AC_MSG_ERROR($missing_library))
		1158	PKG_CHECK_MODULES([DVDREAD], [dvdread],
		1159	[INCLUDES="$INCLUDES $DVDREAD_CFLAGS"; LIBS="$LIBS $DVDREAD_LIBS"],
		1160	AC_MSG_ERROR($missing_library))
1158		1161
1159	if test "$use_optical_drive" = "yes"; then	1162	if test "$use_optical_drive" = "yes"; then
1160	PKG_CHECK_MODULES([CDIO], [libcdio],	1163	PKG_CHECK_MODULES([CDIO], [libcdio],
Lines 2684-2710 Link Here
2684	--with-pic	2687	--with-pic
2685	], [$SKIP_CONFIG_DVDCSS])	2688	], [$SKIP_CONFIG_DVDCSS])
2686		2689
2687	XB_CONFIG_MODULE([lib/libdvd/libdvdread], [
2688	./configure2 \
2689	--extra-cflags="$CFLAGS $DVDREAD_CFLAGS -I`pwd`/../libdvdcss/src $DROID_DVDLIB_SEEK64" \
2690	--prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \
2691	--host=$host_alias \
2692	--build=$build_alias \
2693	--target=$target_alias \
2694	--enable-static \
2695	--disable-shared \
2696	--disable-strip \
2697	--disable-opts \
2698	--cc="$CC" &&
2699	mkdir -p `pwd`/../includes/dvdread
2700	cp `pwd`/../libdvdread/src/*.h `pwd`/../includes/dvdread
2701	cp `pwd`/../libdvdread/src/dvdread/*.h `pwd`/../includes/dvdread
2702	], [0])
2703
2704	XB_CONFIG_MODULE([lib/libdvd/libdvdnav], [	2690	XB_CONFIG_MODULE([lib/libdvd/libdvdnav], [
2705	./configure2 \	2691	./configure2 \
2706	--extra-cflags="$CFLAGS $DVDREAD_CFLAGS -I`pwd`/../includes $DROID_DVDLIB_SEEK64" \	2692	--extra-cflags="$CFLAGS $DVDREAD_CFLAGS -I`pwd`/../includes $DROID_DVDLIB_SEEK64" \
2707	--extra-ldflags="-L`pwd`/../libdvdread/obj" \
2708	--with-dvdread-config="`pwd`/../dvdread-config" \	2693	--with-dvdread-config="`pwd`/../dvdread-config" \
2709	--prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \	2694	--prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \
2710	--host=$host_alias \	2695	--host=$host_alias \

Lines 5-12 Link Here

(-)xbmc-14.1-Helix.orig/lib/libdvd/Makefile.in (-11 / +6 lines)
5		5
6	SYSDIR=@abs_top_srcdir@/system/players/dvdplayer	6	SYSDIR=@abs_top_srcdir@/system/players/dvdplayer
7	SOS= libdvdnav-$(ARCH).so	7	SOS= libdvdnav-$(ARCH).so
8	DIRS= libdvdread \	8	DIRS= libdvdnav
9	libdvdnav
10		9
11	WRAPPER=@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o	10	WRAPPER=@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o
12	WRAPPER_MACH_ALIAS=@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias	11	WRAPPER_MACH_ALIAS=@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias
Lines 48-56 Link Here
48	$(CC) $(LDFLAGS) -Wl,-alias_list,$(WRAPPER_MACH_ALIAS) -o $@ \	47	$(CC) $(LDFLAGS) -Wl,-alias_list,$(WRAPPER_MACH_ALIAS) -o $@ \
49	$(WRAPPER) libdvdcss/src/*.o $(BUNDLE1_O)	48	$(WRAPPER) libdvdcss/src/*.o $(BUNDLE1_O)
50		49
51	$(SYSDIR)/libdvdnav-$(ARCH).so: $($(WRAPPER)) $(DVDCSS_A) libdvdread/obj/libdvdread.a libdvdnav/obj/libdvdnav.a	50	$(SYSDIR)/libdvdnav-$(ARCH).so: $($(WRAPPER)) $(DVDCSS_A) libdvdnav/obj/libdvdnav.a
52	$(CC) $(LDFLAGS) -Wl,-alias_list,$(WRAPPER_MACH_ALIAS) -o $@ \	51	$(CC) $(LDFLAGS) -Wl,-alias_list,$(WRAPPER_MACH_ALIAS) -o $@ \
53	$(WRAPPER) $(DVDCSS_O) libdvdread/obj/.o libdvdnav/obj/.o $(BUNDLE1_O)	52	$(WRAPPER) $(DVDCSS_O) libdvdnav/obj/*.o $(BUNDLE1_O)
54		53
55	else	54	else
56		55
Lines 59-68 Link Here
59	libdvdcss/src/*.o -Wl,--unresolved-symbols=ignore-all -lm \	58	libdvdcss/src/*.o -Wl,--unresolved-symbols=ignore-all -lm \
60	`cat $(WRAPPER:.o=.def)` $(WRAPPER)	59	`cat $(WRAPPER:.o=.def)` $(WRAPPER)
61		60
62	$(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER) $(DVDCSS_A) libdvdread/obj/libdvdread.a libdvdnav/obj/libdvdnav.a	61	$(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER) $(DVDCSS_A) libdvdnav/obj/libdvdnav.a
63	$(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ $(DVDCSS_O) libdvdread/obj/.o libdvdnav/obj/.o -lm \	62	$(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ $(DVDCSS_O) libdvdnav/obj/*.o -lm \
64	-Wl,--unresolved-symbols=ignore-all \	63	-Wl,--unresolved-symbols=ignore-all \
65	`cat $(WRAPPER:.o=.def)` $(WRAPPER)	64	`cat $(WRAPPER:.o=.def)` $(WRAPPER) -ldvdread
66		65
67	endif	66	endif
68		67
Lines 70-79 Link Here
70	libdvdcss: compile	69	libdvdcss: compile
71	$(MAKE) -C $@	70	$(MAKE) -C $@
72		71
73	libdvdread/obj/libdvdread.a: libdvdread;
74	libdvdread: compile
75	$(MAKE) -C $@
76
77	libdvdnav/obj/libdvdnav.a: libdvdnav;	72	libdvdnav/obj/libdvdnav.a: libdvdnav;
78	libdvdnav: compile	73	libdvdnav: compile
79	$(MAKE) -C $@	74	$(MAKE) -C $@