| 1 |
hd_brummy 12/04/30 00:38:55 |
| 2 |
|
| 3 |
Modified: ChangeLog vdr-1.6.0_p2-r9.ebuild |
| 4 |
Log: |
| 5 |
removed un_ifdef handling breaks vdr-setup compile, readdded un_ifdef handling |
| 6 |
|
| 7 |
(Portage version: 2.1.10.11/cvs/Linux i686) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.158 media-video/vdr/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vdr/ChangeLog?rev=1.158&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vdr/ChangeLog?rev=1.158&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vdr/ChangeLog?r1=1.157&r2=1.158 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v |
| 19 |
retrieving revision 1.157 |
| 20 |
retrieving revision 1.158 |
| 21 |
diff -u -r1.157 -r1.158 |
| 22 |
--- ChangeLog 29 Apr 2012 16:15:55 -0000 1.157 |
| 23 |
+++ ChangeLog 30 Apr 2012 00:38:55 -0000 1.158 |
| 24 |
@@ -1,6 +1,10 @@ |
| 25 |
# ChangeLog for media-video/vdr |
| 26 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.157 2012/04/29 16:15:55 hd_brummy Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.158 2012/04/30 00:38:55 hd_brummy Exp $ |
| 29 |
+ |
| 30 |
+ 30 Apr 2012; Joerg Bornkessel <hd_brummy@g.o> vdr-1.6.0_p2-r9.ebuild: |
| 31 |
+ removed un_ifdef handling breaks vdr-setup compile, readdded un_ifdef |
| 32 |
+ handling |
| 33 |
|
| 34 |
*vdr-1.6.0_p2-r9 (29 Apr 2012) |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.2 media-video/vdr/vdr-1.6.0_p2-r9.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vdr/vdr-1.6.0_p2-r9.ebuild?rev=1.2&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vdr/vdr-1.6.0_p2-r9.ebuild?rev=1.2&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vdr/vdr-1.6.0_p2-r9.ebuild?r1=1.1&r2=1.2 |
| 44 |
|
| 45 |
Index: vdr-1.6.0_p2-r9.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p2-r9.ebuild,v |
| 48 |
retrieving revision 1.1 |
| 49 |
retrieving revision 1.2 |
| 50 |
diff -u -r1.1 -r1.2 |
| 51 |
--- vdr-1.6.0_p2-r9.ebuild 29 Apr 2012 16:15:55 -0000 1.1 |
| 52 |
+++ vdr-1.6.0_p2-r9.ebuild 30 Apr 2012 00:38:55 -0000 1.2 |
| 53 |
@@ -1,6 +1,6 @@ |
| 54 |
# Copyright 1999-2012 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p2-r9.ebuild,v 1.1 2012/04/29 16:15:55 hd_brummy Exp $ |
| 57 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p2-r9.ebuild,v 1.2 2012/04/30 00:38:55 hd_brummy Exp $ |
| 58 |
|
| 59 |
EAPI="4" |
| 60 |
|
| 61 |
@@ -56,6 +56,7 @@ |
| 62 |
|
| 63 |
DEPEND="${COMMON_DEPEND} |
| 64 |
>=virtual/linuxtv-dvb-headers-5 |
| 65 |
+ dev-util/unifdef |
| 66 |
setup? ( >=dev-libs/tinyxml-2.6.1[stl] )" |
| 67 |
|
| 68 |
RDEPEND="${COMMON_DEPEND} |
| 69 |
@@ -116,6 +117,61 @@ |
| 70 |
| tr '[:upper:]' '[:lower:]' |
| 71 |
} |
| 72 |
|
| 73 |
+extensions_all_defines_unset() { |
| 74 |
+ # extract all possible settings for extensions-patch |
| 75 |
+ # and convert them to -U... for unifdef |
| 76 |
+ sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?/-UUSE_/' -e 's/ .*//' \ |
| 77 |
+ Make.config.template \ |
| 78 |
+ | tr '\n' ' ' |
| 79 |
+} |
| 80 |
+ |
| 81 |
+do_unifdef() { |
| 82 |
+ ebegin "Unifdef sources" |
| 83 |
+ local mf="Makefile.get" |
| 84 |
+ cat <<'EOT' > $mf |
| 85 |
+include Makefile |
| 86 |
+show_def: |
| 87 |
+ @echo $(DEFINES) |
| 88 |
+show_src_files: |
| 89 |
+ @echo $(OBJS:%.o=%.c) |
| 90 |
+EOT |
| 91 |
+ |
| 92 |
+ local DEFINES=$(extensions_all_defines_unset) |
| 93 |
+ |
| 94 |
+ local RAW_DEFINES=$(make -f "$mf" show_def) |
| 95 |
+ local VDR_SRC_FILES=$(make -f "$mf" show_src_files) |
| 96 |
+ local KEEP_FILES="" |
| 97 |
+ rm "$mf" |
| 98 |
+ |
| 99 |
+ local def |
| 100 |
+ for def in $RAW_DEFINES; do |
| 101 |
+ case "${def}" in |
| 102 |
+ -DUSE*) |
| 103 |
+ DEFINES="${DEFINES} ${def}" |
| 104 |
+ ;; |
| 105 |
+ esac |
| 106 |
+ done |
| 107 |
+ |
| 108 |
+ local f |
| 109 |
+ for f in *.c; do |
| 110 |
+ |
| 111 |
+ # Removing the src files the Makefile does not use for compiling vdr |
| 112 |
+ if ! has $f ${VDR_SRC_FILES} ${KEEP_FILES}; then |
| 113 |
+ rm -f ${f} ${f%.c}.h |
| 114 |
+ continue |
| 115 |
+ fi |
| 116 |
+ |
| 117 |
+ unifdef ${DEFINES} "$f" > "tmp.$f" |
| 118 |
+ mv "tmp.$f" "$f" |
| 119 |
+ done |
| 120 |
+ for f in *.h; do |
| 121 |
+ unifdef ${DEFINES} "$f" > "tmp.$f" |
| 122 |
+ mv "tmp.$f" "$f" |
| 123 |
+ [[ -s $f ]] || rm "$f" |
| 124 |
+ done |
| 125 |
+ eend 0 |
| 126 |
+} |
| 127 |
+ |
| 128 |
lang_linguas() { |
| 129 |
LING1=$( cat /etc/make.conf | grep LINGUAS | sed -e "s:LINGUAS=::" -e "s:\"::g" ) |
| 130 |
} |
| 131 |
@@ -185,7 +241,7 @@ |
| 132 |
epatch "${FILESDIR}"/vdr-1.6.0-gcc-4.4.diff |
| 133 |
epatch "${FILESDIR}"/vdr-1.6.0-extensions-72-gcc-4.4.diff |
| 134 |
epatch "${FILESDIR}"/vdr-1.6.0-shared-tinyxml.diff |
| 135 |
- epatch "${FILESDIR}/${P}_linguas.diff" |
| 136 |
+ epatch "${FILESDIR}"/vdr-1.6.0_p2_linguas.diff |
| 137 |
|
| 138 |
# This allows us to start even if some plugin does not exist |
| 139 |
# or is not loadable. |
| 140 |
@@ -235,6 +291,8 @@ |
| 141 |
emake .dependencies >/dev/null |
| 142 |
eend $? "make depend failed" |
| 143 |
|
| 144 |
+ [[ -z "$NO_UNIFDEF" ]] && do_unifdef |
| 145 |
+ |
| 146 |
use iptv && sed -i sources.conf -e 's/^#P/P/' |
| 147 |
fi |
| 148 |
|
| 149 |
@@ -249,7 +307,7 @@ |
| 150 |
|
| 151 |
echo -e ${CAPS} > "${CAP_FILE}" |
| 152 |
|
| 153 |
- # LINGUAS handling support |
| 154 |
+ # LINGUAS handling |
| 155 |
einfo "\n \t VDR supports now the LINGUAS values" |
| 156 |
|
| 157 |
lang_po |
Archives