Merge remote branch 'dream/master'

Conflicts:
	data/skin_default.xml
	lib/python/Plugins/Extensions/DVDPlayer/src/Makefile.am
	main/Makefile.am

Makefile.am

@@ -8,6 +8,9 @@ install_PYTHON = \
 	keyids.py keymapparser.py mytest.py skin.py timer.py GlobalActions.py \
 	e2reactor.py
 
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = enigma2.pc
+
 metadir = $(datadir)/meta
 meta_DATA = index-enigma2.xml
 CLEANFILES = index-enigma2.xml

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([enigma2],[2.8.0],[enigma2-devel@lists.elitedvb.net])
+AC_INIT([enigma2],[3.0.0],[enigma2-devel@lists.elitedvb.net])
 AM_INIT_AUTOMAKE([dist-bzip2 no-define tar-pax -Wno-portability])
 AC_CONFIG_HEADERS([enigma2_config.h])
 
@@ -16,14 +16,7 @@ AC_CONFIG_MACRO_DIR([m4])
 
 AC_CHECK_HEADERS([dbox/fp.h dbox/lcd-ks0713.h])
 
-AC_PATH_PROG(MSGFMT,[msgfmt])
-AC_PATH_PROG(MSGINIT,[msginit])
-AC_PATH_PROG(MSGMERGE,[msgmerge])
-AC_PATH_PROG(MSGUNIQ,[msguniq])
-AC_PATH_PROG(XGETTEXT,[xgettext])
-if test -z "$MSGFMT" -o -z "$MSGINIT" -o -z "$MSGMERGE" -o -z "$MSGUNIQ" -o -z "$XGETTEXT"; then
-	AC_MSG_ERROR([Could not find required gettext tools])
-fi
+AC_PATH_PROG(MSGFMT, msgfmt, AC_MSG_ERROR(Could not find msgfmt))
 
 AM_PATH_PYTHON
 AX_PYTHON_DEVEL
@@ -112,12 +105,25 @@ if test "$with_memcheck" = "yes"; then
 fi
 
 AC_ARG_WITH(po,
-	AS_HELP_STRING([--without-po],[disable updating of po files]),
-	[with_po="$withval"],[with_po="yes"])
+	AS_HELP_STRING([--with-po],[enable updating of po files]),
+	[with_po="$withval"],[with_po="no"])
+if test "$with_po" = "yes"; then
+	AC_PATH_PROG(MSGINIT, msginit)
+	AC_PATH_PROG(MSGMERGE, msgmerge)
+	AC_PATH_PROG(MSGUNIQ, msguniq)
+	AC_PATH_PROG(XGETTEXT, xgettext)
+	if test -z "$MSGINIT" -o -z "$MSGMERGE" -o -z "$MSGUNIQ" -o -z "$XGETTEXT"; then
+		AC_MSG_ERROR([Could not find required gettext tools])
+	fi
+fi
 AM_CONDITIONAL(UPDATE_PO, test "$with_po" = "yes")
 
+ENIGMA2_CFLAGS="-fno-rtti -fno-exceptions"
+AC_SUBST(ENIGMA2_CFLAGS)
+
 CPPFLAGS="$CPPFLAGS $PYTHON_CPPFLAGS"
-CXXFLAGS="$CXXFLAGS $BASE_CFLAGS $PTHREAD_CFLAGS $DEBUG_CFLAGS -fno-rtti -fno-exceptions -Wall"
+CFLAGS="$CFLAGS $DEBUG_CFLAGS -Wall"
+CXXFLAGS="$CXXFLAGS $DEBUG_CFLAGS -Wall $BASE_CFLAGS $ENIGMA2_CFLAGS $PTHREAD_CFLAGS"
 
 AC_CONFIG_FILES([
 Makefile

enigma2.pc.in

@@ -6,5 +6,5 @@ includedir=@includedir@
 Name: enigma2
 Description: Enigma2
 Version: @VERSION@
-Libs: 
-Cflags: -I${includedir}/enigma2
+Cflags: -I${includedir}/enigma2 @ENIGMA2_CFLAGS@
+Requires.private: sigc++-1.2

lib/dvb/pmt.h

@@ -139,7 +139,7 @@ class eDVBServicePMTHandler: public Object
 		{
 			uint16_t caid;
 			int capid;
-			bool operator< (const struct capid_pair &t) { return t.caid < caid; }
+			bool operator< (const struct capid_pair &t) const { return t.caid < caid; }
 		};
 		std::vector<videoStream> videoStreams;
 		std::vector<audioStream> audioStreams;

lib/python/Components/Harddisk.py

@@ -182,7 +182,7 @@ def unmount(self):
 		return (res >> 8)
 
 	def createPartition(self):
-		cmd = 'printf "0,\n;\n;\n;\ny\n" | sfdisk -f ' + self.disk_path
+		cmd = 'printf "8,\n;0,0\n;0,0\n;0,0\ny\n" | sfdisk -f -uS ' + self.disk_path
 		res = system(cmd)
 		return (res >> 8)
 

lib/python/Plugins/Extensions/DVDPlayer/src/Makefile.am

@@ -4,6 +4,8 @@ AM_CPPFLAGS = \
 	-include Python.h \
 	-include $(top_builddir)/enigma2_config.h
 
+AM_CXXFLAGS = @LIBDDVD_CFLAGS@
+
 plugindir = $(pkglibdir)/python/Plugins/Extensions/DVDPlayer
 
 plugin_LTLIBRARIES = servicedvd.la
@@ -12,4 +14,5 @@ servicedvd_la_SOURCES = \
 	servicedvd.cpp \
 	servicedvd.h
 
-servicedvd_la_LDFLAGS = -avoid-version -module -ldreamdvd
+servicedvd_la_LDFLAGS = -avoid-version -module
+servicedvd_la_LIBADD = @LIBDDVD_LIBS@

main/Makefile.am

@@ -59,34 +59,24 @@ GIT_DIR = $(top_srcdir)/.git
 GIT = git --git-dir=$(GIT_DIR)
 
 if HAVE_FAKE_GIT_DIR
-ENIGMA2_DATE = `cat $(GIT_DIR)/last_commit_info | grep 'Date:' | cut -d' ' -f4`
-ENIGMA2_COMMIT_DATE = `cat $(GIT_DIR)/last_commit_info | grep 'CommitDate:' | cut -d' ' -f2`
+ENIGMA2_COMMIT_DATE = `grep '^CommitDate:' $(GIT_DIR)/last_commit_info | cut -d' ' -f2`
 ENIGMA2_BRANCH = `cat $(GIT_DIR)/branch`
 else
-ENIGMA2_DATE =
 ENIGMA2_COMMIT_DATE = `$(GIT) log --no-color -n 1 --pretty=format:%cd --date=short`
 ENIGMA2_BRANCH = `$(GIT) branch --no-color 2>/dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/'`
 ENIGMA2_REV = `$(GIT) describe --abbrev=7 --always --long --tags`
 endif
+endif
 
 BUILT_SOURCES = version-intermediate.h
 .INTERMEDIATE: version-intermediate.h
 .PHONY: version-intermediate.h
 version-intermediate.h:
 	$(AM_V_GEN)touch $@
-	$(AM_V_at)if [ -n "$(ENIGMA2_COMMIT_DATE)" ]; then \
-		[ -n "$(ENIGMA2_COMMIT_DATE)" ] && echo "#define ENIGMA2_LAST_CHANGE_DATE \"$(ENIGMA2_COMMIT_DATE)\"" >> $@; \
-	else \
-		[ -n "$(ENIGMA2_DATE)" ] && echo "#define ENIGMA2_LAST_CHANGE_DATE \"$(ENIGMA2_DATE)\"" >> $@; \
-	fi;
-	$(AM_V_at)[ -n "$(ENIGMA2_BRANCH)" ] && echo "#define ENIGMA2_BRANCH \"$(ENIGMA2_BRANCH)\"" >> $@
-	$(AM_V_at)[ -n "$(ENIGMA2_REV)" ] && echo "#define ENIGMA2_REV \"$(ENIGMA2_REV)\"" >> $@
+	-$(AM_V_at)[ -n "$(ENIGMA2_COMMIT_DATE)" ] && echo "#define ENIGMA2_COMMIT_DATE \"$(ENIGMA2_COMMIT_DATE)\"" >> $@
+	-$(AM_V_at)[ -n "$(ENIGMA2_BRANCH)" ] && echo "#define ENIGMA2_BRANCH \"$(ENIGMA2_BRANCH)\"" >> $@
+	-$(AM_V_at)[ -n "$(ENIGMA2_REV)" ] && echo "#define ENIGMA2_REV \"$(ENIGMA2_REV)\"" >> $@
 	$(AM_V_at)([ -f version.h ] && diff -q version.h $@ >/dev/null) || $(INSTALL_HEADER) $@ version.h
-else
-BUILT_SOURCES = version.h
-version.h:
-	$(AM_V_GEN)touch $@
-endif
 
 enigma2$(EXEEXT): $(enigma2_OBJECTS) $(enigma2_DEPENDENCIES) $(enigma2_LDADD_WHOLE)
 	$(AM_V_CXXLD)$(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ $(enigma2_LDFLAGS) $(enigma2_OBJECTS) \

main/version_info.cpp

@@ -1,13 +1,13 @@
 #include "version_info.h"
 #include "version.h"
 
-#ifndef ENIGMA2_LAST_CHANGE_DATE
-#define ENIGMA2_LAST_CHANGE_DATE __DATE__
+#ifndef ENIGMA2_COMMIT_DATE
+#define ENIGMA2_COMMIT_DATE __DATE__
 #endif
-const char *enigma2_date = ENIGMA2_LAST_CHANGE_DATE;
+const char *enigma2_date = ENIGMA2_COMMIT_DATE;
 
 #ifndef ENIGMA2_BRANCH
-#define ENIGMA2_BRANCH "HEAD"
+#define ENIGMA2_BRANCH "(no branch)"
 #endif
 const char *enigma2_branch = ENIGMA2_BRANCH;