From: Arne Fitzenreiter Date: Sun, 13 Nov 2011 13:30:18 +0000 (+0100) Subject: lcd4linux: update to svn1158 and add hacked digital-photo-frame driver. X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=b173e0824b7fbe0cf6fd7670d2718acbd3460bf4 lcd4linux: update to svn1158 and add hacked digital-photo-frame driver. thx to gerdh for his work and inspiration. --- diff --git a/config/rootfiles/packages/dpfhack b/config/rootfiles/packages/dpfhack new file mode 100644 index 000000000..27319b4cf --- /dev/null +++ b/config/rootfiles/packages/dpfhack @@ -0,0 +1,3 @@ +#usr/include/dpf.h +#usr/include/usbuser.h +usr/lib/libdpf.so \ No newline at end of file diff --git a/lfs/dpfhack b/lfs/dpfhack new file mode 100644 index 000000000..00d654521 --- /dev/null +++ b/lfs/dpfhack @@ -0,0 +1,84 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2011 IPFire Team # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see . # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 0.12devel +APP = dpf +THISAPP = dpfhack-$(VER) +DL_FILE = $(THISAPP).tgz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(APP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = dpfhack +PAK_VER = 1 + +DEPS = "" + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 00473bb01d8da7c5967ecb19ca251ac2 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + $(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(PROG).patch + cd $(DIR_APP) && make + cd $(DIR_APP) && cp Debug/libdpf.so /usr/lib && cp dpflib/dpf.h include/usbuser.h /usr/include + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/lcd4linux b/lfs/lcd4linux index a0ae13848..446a13171 100644 --- a/lfs/lcd4linux +++ b/lfs/lcd4linux @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2011 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,17 +24,17 @@ include Config -VER = 0.10.1-RC2 +VER = 0.11.0-svn1158-dpf THISAPP = lcd4linux-$(VER) -DL_FILE = $(THISAPP).tar.gz +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = lcd4linux PAK_VER = 2 -DEPS = "" +DEPS = "dpfhack libmpdclient" ############################################################################### # Top-level Rules @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = a64c40feb74862cb4a91281bc7737f72 +$(DL_FILE)_MD5 = 0b7eba14a92ae5d51a3ab99948192b8d install : $(TARGET) @@ -76,9 +76,9 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/var/ipfire/lcd4linux - cd $(DIR_APP) && make $(MAKETUNING) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure --with-plugins=all,!qnaplog,!dbus --prefix=/usr + cd $(DIR_APP) && make cd $(DIR_APP) && make install install -v -m 644 $(DIR_SRC)/config/backup/includes/lcd4linux /var/ipfire/backup/addons/includes/lcd4linux @rm -rf $(DIR_APP) diff --git a/make.sh b/make.sh index a781d0efa..f8043b81b 100755 --- a/make.sh +++ b/make.sh @@ -642,7 +642,6 @@ buildipfire() { ipfiremake lm_sensors ipfiremake liboping ipfiremake collectd - ipfiremake lcd4linux ipfiremake teamspeak ipfiremake elinks ipfiremake igmpproxy @@ -741,6 +740,8 @@ buildipfire() { ipfiremake intltool ipfiremake pakfire3-deps ipfiremake transmission + ipfiremake dpfhack + ipfiremake lcd4linux echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild echo >> $BASEDIR/build/var/ipfire/firebuild diff --git a/src/patches/dpfhack.patch b/src/patches/dpfhack.patch new file mode 100644 index 000000000..2a473175a --- /dev/null +++ b/src/patches/dpfhack.patch @@ -0,0 +1,12 @@ +diff -Naur dpf_alt/python/Makefile dpf/python/Makefile +--- dpf_alt/python/Makefile 2011-04-18 17:14:12.000000000 +0200 ++++ dpf/python/Makefile 2011-08-14 13:22:46.129748815 +0200 +@@ -32,7 +32,7 @@ + endif + + ifeq (Linux, $(PLATFORM)) +- PYTHON=$(shell pyversions -d) ++ PYTHON=python2.7 + include $(DEVLIB)/unixdll.mk + DLLDEPS = $(CLIENTLIB) -l$(PYTHON) + PYTHONINCLUDES = -I/usr/include/$(PYTHON)