Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Android PVR Depends #1615

Merged
merged 3 commits into from
Oct 15, 2012
Merged

Android PVR Depends #1615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
409f7c7
[droid] add pvr-addons makefile
Oct 8, 2012
4919133
[droid] build pvr-addons
Oct 8, 2012
c2956cf
[droid] package pvr addons
Oct 8, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion tools/android/depends/Makefile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ SUBDIRS = \
python26-native python26 samba alsa-lib libcdio afpfs-ng libshairport \
libplist libcec libbluray boost tinyxml dummy-libxbmc libsdl \
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

Expand Down
50 changes: 50 additions & 0 deletions tools/android/depends/xbmc-pvr-addons/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
include ../Makefile.include
DEPS= ../Makefile.include Makefile

LIBNAME=xbmc-pvr-addons
VERSION=46eb5b50bd145e1bae637213a5929384ac0fc13c
GIT_DIR=$(TARBALLS_LOCATION)/$(LIBNAME).git
BASE_URL=git://github.com/opdenkamp/$(LIBNAME).git
DYLIB=$(PLATFORM)/addons/pvr.demo/.libs/libpvrdemo-addon.so
#tell git to use the addons repo rather than xbmc's repo
export GIT_DIR
export GIT_WORK_TREE=$(PLATFORM)
# configuration settings
CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST)

all: .installed-$(PLATFORM)

$(GIT_DIR)/HEAD:
cd $(TARBALLS_LOCATION); git clone --bare $(BASE_URL)

$(GIT_DIR)/current/$(VERSION): $(GIT_DIR)/HEAD $(DEPS)
git rev-list -1 $(VERSION) >/dev/null || git fetch -a
git rev-list -1 $(VERSION) >/dev/null
rm -rf $(GIT_DIR)/current; mkdir -p $(GIT_DIR)/current
touch $@

$(PLATFORM)/bootstrap: $(GIT_DIR)/current/$(VERSION)
rm -rf $(PLATFORM); mkdir -p $(PLATFORM)
git checkout $(VERSION) -- .

$(PLATFORM)/configure: $(PLATFORM)/bootstrap
cd $(PLATFORM); ./bootstrap

$(PLATFORM)/Makefile: $(PLATFORM)/configure
cd $(PLATFORM); $(CONFIGURE)

$(DYLIB): $(PLATFORM)/Makefile
make -C $(PLATFORM)

.installed-$(PLATFORM): $(DYLIB)
$(MAKE) -C $(PLATFORM) install
touch $@

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

distclean::
rm -rf $(PLATFORM) .installed-$(PLATFORM)
rm -rf $(GIT_DIR)/current

1 change: 1 addition & 0 deletions tools/android/packaging/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ libs: $(PREFIX)/lib/xbmc/libxbmc.so
mkdir -p xbmc/lib/$(PLATFORM) images xbmc/assets/python2.6/lib/ xbmc/libs/$(PLATFORM) xbmc/obj/local/$(PLATFORM)
cp -fp $(SRCLIBS) xbmc/obj/local/$(PLATFORM)/
cp -fp $(PREFIX)/lib/xbmc/libxbmc.so xbmc/obj/local/$(PLATFORM)/
find $(PREFIX)/lib/xbmc/addons -name "*.so" -exec cp -fp {} xbmc/obj/local/$(PLATFORM)/ \;
find $(PREFIX)/lib/xbmc/system -name "*.so" -exec cp -fp {} xbmc/obj/local/$(PLATFORM)/ \;
cd xbmc/obj/local/$(PLATFORM)/; find . -name "*.so" -not -name "lib*.so" | sed "s/\.\///" | xargs -I@ mv @ lib@
cp -fp xbmc/obj/local/$(PLATFORM)/*.so xbmc/lib/$(PLATFORM)/
Expand Down