Skip to content

Commit

Permalink
[droid] - add pvr addons to the android depends
Browse files Browse the repository at this point in the history
  • Loading branch information
Memphiz committed Oct 3, 2012
1 parent 5e4b59d commit 26774ea
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 1 deletion.
3 changes: 2 additions & 1 deletion tools/android/depends/Makefile.in
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ SUBDIRS = \
python26-native python26 samba alsa-lib libcdio afpfs-ng libshairport \ python26-native python26 samba alsa-lib libcdio afpfs-ng libshairport \
libplist libcec libbluray boost tinyxml dummy-libxbmc libsdl \ libplist libcec libbluray boost tinyxml dummy-libxbmc libsdl \
liblzo2-native libjpeg-turbo-native libpng-native tiff-native libsdl_image rpl \ liblzo2-native libjpeg-turbo-native libpng-native tiff-native libsdl_image rpl \
libamplayer libssh taglib swig-native pcre-native libamplayer libssh taglib swig-native pcre-native xbmc-pvr-addons


.PHONY: buildtools $(BUILDTOOLS) subdirs $(SUBDIRS) arm .PHONY: buildtools $(BUILDTOOLS) subdirs $(SUBDIRS) arm


Expand Down Expand Up @@ -62,6 +62,7 @@ libssh: openssl cmake rpl
taglib: cmake taglib: cmake
swig-native: buildtools pcre-native swig-native: buildtools pcre-native
pcre-native: buildtools pcre-native: buildtools
xbmc-pvr-addons: buildtools




X86OVERRIDES=XBMC_OVERRIDE_HOST=i686-android-linux XBMC_OVERRIDE_TOOLCHAIN=$(XBMC_X86_TOOLCHAIN) X86OVERRIDES=XBMC_OVERRIDE_HOST=i686-android-linux XBMC_OVERRIDE_TOOLCHAIN=$(XBMC_X86_TOOLCHAIN)
Expand Down
49 changes: 49 additions & 0 deletions tools/android/depends/xbmc-pvr-addons/Makefile
Original file line number Original file line Diff line number Diff line change
@@ -0,0 +1,49 @@
include ../Makefile.include
DEPS= ../Makefile.include Makefile

XBMC_ADDONSDIR=../../../../addons

# lib name, version
LIBNAME=xbmc-pvr-addons
VERSION=a6693d02b670a5f0a35c7e41d62250869a9e76b7

This comment has been minimized.

Copy link
@opdenkamp

opdenkamp Oct 3, 2012

this will need a bump cause of a minor api change

SOURCE=$(LIBNAME)-$(VERSION)
ARCHIVE=$(SOURCE).tar.gz

# configuration settings
CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST)

LIBDYLIB=$(PLATFORM)/addons/pvr.demo/.libs/libpvrdemo-addon.dylib

This comment has been minimized.

Copy link
@opdenkamp

opdenkamp Oct 3, 2012

i can see it's based on the darwin deps ;-)


all: $(LIBDYLIB) .installed-$(PLATFORM)

$(TARBALLS_LOCATION)/$(ARCHIVE):
git clone git://github.com/opdenkamp/xbmc-pvr-addons.git $(PLATFORM)
cd $(PLATFORM); git archive --format=tar --prefix=$(SOURCE)/ $(VERSION) | gzip -9 > $(TARBALLS_LOCATION)/$(ARCHIVE)

$(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
$(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
cd $(PLATFORM); ./bootstrap
cd $(PLATFORM); $(CONFIGURE)

$(LIBDYLIB): $(PLATFORM)
make -C $(PLATFORM)

.installed-$(PLATFORM): $(LIBDYLIB)
for ADDON in `find $(PLATFORM)/addons -type d -name "pvr.*"`; do \
ADDON=`basename $$ADDON` ; \
mkdir -p $(XBMC_ADDONSDIR)/$$ADDON ; \
cp -PRf $(PLATFORM)/addons/$$ADDON/addon/* $(XBMC_ADDONSDIR)/$$ADDON ; \
cp -Pf $(PLATFORM)/addons/$$ADDON/*.pvr $(XBMC_ADDONSDIR)/$$ADDON ; \
done
make -C $(PLATFORM) install
touch .installed-$(PLATFORM)

clean:
make -C $(PLATFORM) clean
rm -f .installed-$(PLATFORM)

distclean::
rm -rf $(PLATFORM) .installed-$(PLATFORM)
rm -f $(TARBALLS_LOCATION)/$(ARCHIVE)

2 comments on commit 26774ea

@theuni
Copy link
Collaborator

@theuni theuni commented on 26774ea Oct 7, 2012

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs quite a few changes in order to not break parallel build. I'll push a patch in the next few hours when i can jump to my android tree.

@Memphiz
Copy link
Owner Author

@Memphiz Memphiz commented on 26774ea Oct 7, 2012

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool :). I thought it would need some more changes at runtime too no?

Please sign in to comment.