diff --git a/packages/mediacenter/xbmc/build b/packages/mediacenter/xbmc/build index 8771e01746..7f13c7eca9 100755 --- a/packages/mediacenter/xbmc/build +++ b/packages/mediacenter/xbmc/build @@ -265,7 +265,6 @@ cd $PKG_BUILD --exec-prefix=/usr \ --sysconfdir=/etc \ --datadir=/usr/share \ - GIT_REV=`cat git.version` \ --disable-debug \ --disable-optimizations \ $XBMC_OPENGL \ diff --git a/packages/mediacenter/xbmc/patches/xbmc-001-add_support_to_specify_GIT_REV-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-001-add_support_to_specify_GIT_REV-0.1.patch deleted file mode 100644 index c013e0ae3a..0000000000 --- a/packages/mediacenter/xbmc/patches/xbmc-001-add_support_to_specify_GIT_REV-0.1.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -Naur xbmc-9389dc8/configure.in xbmc-9389dc8.patch/configure.in ---- xbmc-9389dc8/configure.in 2011-09-01 17:21:47.000000000 +0200 -+++ xbmc-9389dc8.patch/configure.in 2011-09-01 23:30:40.419399392 +0200 -@@ -428,6 +428,14 @@ - esac - AC_SUBST([ARCH]) - -+AC_CHECK_PROG(HAVE_GIT,git,"yes","no",) -+if test "$HAVE_GIT" = "yes" -a "$GIT_REV" = ""; then -+ GIT_REV=$(git --no-pager log --abbrev=7 -n 1 --pretty=format:"%h %ci" HEAD | awk '{gsub("-", "");print $2"-"$1}') -+elif test "$GIT_REV" = ""; then -+ GIT_REV="Unknown" -+fi -+final_message="$final_message\n git Rev.:\t${GIT_REV}" -+ - # platform debug flags - if test "$use_debug" = "yes"; then - final_message="$final_message\n Debugging:\tYes" -@@ -1177,7 +1185,6 @@ - fi - fi - --AC_CHECK_PROG(HAVE_GIT,git,"yes","no",) - - # Checks for header files. - AC_HEADER_DIRENT -@@ -1408,12 +1415,6 @@ - final_message="$final_message\n Avahi:\tNo" - fi - --if test "$HAVE_GIT" = "yes"; then -- GIT_REV=$(git --no-pager log --abbrev=7 -n 1 --pretty=format:"%h %ci" HEAD | awk '{gsub("-", "");print $2"-"$1}') --fi --if test "$GIT_REV" = ""; then -- GIT_REV="Unknown" --fi - if test "$host_vendor" = "apple"; then - echo "#define GIT_REV \"$GIT_REV\"" > git_revision.h - else diff --git a/packages/mediacenter/xbmc/patches/xbmc-990.04-PR1934.patch b/packages/mediacenter/xbmc/patches/xbmc-990.04-PR1934.patch new file mode 100644 index 0000000000..8079f1049a --- /dev/null +++ b/packages/mediacenter/xbmc/patches/xbmc-990.04-PR1934.patch @@ -0,0 +1,55 @@ +From 1704ff69ba704bf53505f7f9ac51ec06f93401ee Mon Sep 17 00:00:00 2001 +From: wsnipex +Date: Sun, 9 Dec 2012 14:37:21 +0100 +Subject: [PATCH 1/2] configure: allow GIT_REV to be read from VERSION file + needed for building outside of a git repo + +--- + configure.in | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/configure.in b/configure.in +index d8c7804..ac1445c 100644 +--- a/configure.in ++++ b/configure.in +@@ -2160,7 +2160,12 @@ if test "$HAVE_GIT" = "yes"; then + GIT_REV=$(git --no-pager log --abbrev=7 -n 1 --pretty=format:"%h %ci" HEAD | awk '{gsub("-", "");print $2"-"$1}') + fi + if test "$GIT_REV" = ""; then +- GIT_REV="Unknown" ++ if test -f VERSION ; then ++ GIT_REV=$(awk 'END{print substr($1,1,16)}' VERSION) ++ if test -z $GIT_REV ; then GIT_REV="Unknown" ; fi ++ else ++ GIT_REV="Unknown" ++ fi + fi + if test "$host_vendor" = "apple"; then + echo "#define GIT_REV \"$GIT_REV\"" > git_revision.h +-- +1.7.10 + + +From 4377a985c7e4e4d1f1c0abba68c2367d33ddab03 Mon Sep 17 00:00:00 2001 +From: wsnipex +Date: Sun, 16 Dec 2012 17:46:12 +0100 +Subject: [PATCH 2/2] release-source script needs bash on some systems /bin/sh + is a simplistic posix shell + +--- + tools/mk-release-source | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/mk-release-source b/tools/mk-release-source +index 7964665..68bdfa1 100755 +--- a/tools/mk-release-source ++++ b/tools/mk-release-source +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + REVISION="${1}" + COMPRESS="gzip" + WORKDIR="xbmc-${REVISION}" +-- +1.7.10 + diff --git a/packages/mediacenter/xbmc/patches/xbmc-990.05-PR2193.patch b/packages/mediacenter/xbmc/patches/xbmc-990.05-PR2193.patch new file mode 100644 index 0000000000..ab619e9a67 --- /dev/null +++ b/packages/mediacenter/xbmc/patches/xbmc-990.05-PR2193.patch @@ -0,0 +1,88 @@ +From 1e3abea7b9a4212005b11dbb5a9542ca9cbcd21a Mon Sep 17 00:00:00 2001 +From: Stephan Raue +Date: Thu, 7 Feb 2013 18:27:08 +0100 +Subject: [PATCH] configure.in: change check for 'VERSION' file: - first check + if this file exist and use the content from there - if it + not exist check with 'git log' - if this fails set to + 'Unknown' + +This patch also shows the GIT_REV in the configure summary message. To display This message on top of the messages we move the whole block a bit above +--- + configure.in | 40 ++++++++++++++++++++-------------------- + 1 file changed, 20 insertions(+), 20 deletions(-) + +diff --git a/configure.in b/configure.in +index ac1445c..869fd29 100644 +--- a/configure.in ++++ b/configure.in +@@ -687,6 +687,25 @@ case $use_platform in + ;; + esac + ++# check for GIT_REV ++AC_CHECK_PROG(HAVE_GIT,git,"yes","no",) ++if test "$GIT_REV" = ""; then ++ if test -f VERSION ; then ++ GIT_REV=$(awk 'END{print substr($1,1,16)}' VERSION) ++ elif test "$HAVE_GIT" = "yes"; then ++ GIT_REV=$(git --no-pager log --abbrev=7 -n 1 --pretty=format:"%h %ci" HEAD | awk '{gsub("-", "");print $2"-"$1}') ++ else ++ GIT_REV="Unknown" ++ fi ++fi ++final_message="$final_message\n git Rev.:\t${GIT_REV}" ++ ++if test "$host_vendor" = "apple"; then ++ echo "#define GIT_REV \"$GIT_REV\"" > git_revision.h ++else ++ SDL_DEFINES="$SDL_DEFINES -D'GIT_REV=\"$GIT_REV\"'" ++fi ++ + if test "$build_shared_lib" = "yes"; then + final_message="$final_message\n Shared lib\tYes" + AC_SUBST(USE_LIBXBMC,1) +@@ -1886,8 +1905,6 @@ if test "$ARCH" = "i486-linux" || test "$ARCH" = "x86-freebsd"; then + fi + fi + +-AC_CHECK_PROG(HAVE_GIT,git,"yes","no",) +- + # Checks for header files. + AC_HEADER_DIRENT + AC_HEADER_STDC +@@ -1943,7 +1960,7 @@ else + USE_OPENGL=1 + else + final_message="$final_message\n OpenGL:\tNo (Very Slow)" +- SDL_DEFINES="-DHAS_SDL_2D" ++ SDL_DEFINES="$SDL_DEFINES -DHAS_SDL_2D" + USE_OPENGL=0 + fi + fi +@@ -2156,23 +2173,6 @@ else + final_message="$final_message\n Avahi:\tNo" + fi + +-if test "$HAVE_GIT" = "yes"; then +- GIT_REV=$(git --no-pager log --abbrev=7 -n 1 --pretty=format:"%h %ci" HEAD | awk '{gsub("-", "");print $2"-"$1}') +-fi +-if test "$GIT_REV" = ""; then +- if test -f VERSION ; then +- GIT_REV=$(awk 'END{print substr($1,1,16)}' VERSION) +- if test -z $GIT_REV ; then GIT_REV="Unknown" ; fi +- else +- GIT_REV="Unknown" +- fi +-fi +-if test "$host_vendor" = "apple"; then +- echo "#define GIT_REV \"$GIT_REV\"" > git_revision.h +-else +- SDL_DEFINES="$SDL_DEFINES -D'GIT_REV=\"$GIT_REV\"'" +-fi +- + if test "$use_nonfree" = "yes"; then + final_message="$final_message\n Non-free:\tYes" + HAVE_XBMC_NONFREE=1 +-- +1.7.10 +