1 |
commit: 7da5ce67a08a90afbbe4b2c82393cd7fca0d74d6 |
2 |
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jul 29 01:37:20 2016 +0000 |
4 |
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jul 29 01:38:02 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7da5ce67 |
7 |
|
8 |
media-tv/nvtv: new revision with a patch to respect CFLAGS. |
9 |
|
10 |
Gentoo-Bug: 240836 |
11 |
|
12 |
Package-Manager: portage-2.2.28 |
13 |
|
14 |
media-tv/nvtv/files/respect-cflags.patch | 31 +++++++++++++++++++++ |
15 |
.../{nvtv-0.4.7-r2.ebuild => nvtv-0.4.7-r3.ebuild} | 32 ++++++---------------- |
16 |
2 files changed, 40 insertions(+), 23 deletions(-) |
17 |
|
18 |
diff --git a/media-tv/nvtv/files/respect-cflags.patch b/media-tv/nvtv/files/respect-cflags.patch |
19 |
new file mode 100644 |
20 |
index 0000000..2fa991f |
21 |
--- /dev/null |
22 |
+++ b/media-tv/nvtv/files/respect-cflags.patch |
23 |
@@ -0,0 +1,31 @@ |
24 |
+The rest of the build system will respect the user's CFLAGS if we |
25 |
+don't wipe them out, so just delete the line that does that. The |
26 |
+removal of the gtk-1.x stuff is so that we can run eautoreconf and |
27 |
+have it work; we don't support gtk1 in Gentoo anyway. |
28 |
+ |
29 |
+diff --git a/configure.in b/configure.in |
30 |
+index f8f48cc..d8f1261 100755 |
31 |
+--- a/configure.in |
32 |
++++ b/configure.in |
33 |
+@@ -57,9 +57,6 @@ dnl |
34 |
+ dnl Debugging enables, CFLAGS |
35 |
+ dnl |
36 |
+ |
37 |
+-dnl Clear -g -O2 from CFLAGS |
38 |
+-CFLAGS="" |
39 |
+- |
40 |
+ AC_MSG_CHECKING(for debugging info) |
41 |
+ |
42 |
+ AC_ARG_ENABLE(debug, |
43 |
+@@ -110,11 +107,6 @@ if test ${with_gtk} = no ; then |
44 |
+ fi |
45 |
+ |
46 |
+ if test ${have_gtk} = no ; then |
47 |
+- if test ${with_gtk} = yes -o ${with_gtk} = gtk1 ; then |
48 |
+- AM_PATH_GTK(1.2.0, have_gtk=gtk1) |
49 |
+- fi |
50 |
+-fi |
51 |
+-if test ${have_gtk} = no ; then |
52 |
+ if test ${with_gtk} = yes -o ${with_gtk} = gtk2 ; then |
53 |
+ AM_PATH_GTK_2_0(2.0.0, have_gtk=gtk2) |
54 |
+ fi |
55 |
|
56 |
diff --git a/media-tv/nvtv/nvtv-0.4.7-r2.ebuild b/media-tv/nvtv/nvtv-0.4.7-r3.ebuild |
57 |
similarity index 59% |
58 |
rename from media-tv/nvtv/nvtv-0.4.7-r2.ebuild |
59 |
rename to media-tv/nvtv/nvtv-0.4.7-r3.ebuild |
60 |
index 2f4a8cd..0cfa7fe 100644 |
61 |
--- a/media-tv/nvtv/nvtv-0.4.7-r2.ebuild |
62 |
+++ b/media-tv/nvtv/nvtv-0.4.7-r3.ebuild |
63 |
@@ -4,6 +4,8 @@ |
64 |
|
65 |
EAPI=6 |
66 |
|
67 |
+inherit autotools |
68 |
+ |
69 |
IUSE="X gtk" |
70 |
|
71 |
DESCRIPTION="TV-Out for NVidia cards" |
72 |
@@ -23,36 +25,20 @@ RDEPEND="sys-apps/pciutils[-zlib] |
73 |
DEPEND="${RDEPEND} |
74 |
X? ( x11-proto/xf86vidmodeproto )" |
75 |
|
76 |
-src_configure() { |
77 |
- local myconf |
78 |
- |
79 |
- if use gtk |
80 |
- then |
81 |
- myconf="${myconf} --with-gtk" |
82 |
- else |
83 |
- myconf="${myconf} --without-gtk" |
84 |
- fi |
85 |
- |
86 |
- use X \ |
87 |
- && myconf="${myconf} --with-x" \ |
88 |
- || myconf="${myconf} --without-x" |
89 |
+PATCHES=( "${FILESDIR}/respect-cflags.patch" ) |
90 |
|
91 |
- econf ${myconf} |
92 |
+src_prepare() { |
93 |
+ default |
94 |
+ eautoreconf |
95 |
} |
96 |
|
97 |
-src_compile() { |
98 |
- # The CFLAGS don't seem to make it into the Makefile. |
99 |
- cd src |
100 |
- emake CXFLAGS="${CFLAGS}" |
101 |
+src_configure() { |
102 |
+ econf $(use_with gtk) $(use_with X x) |
103 |
} |
104 |
|
105 |
src_install() { |
106 |
dobin src/nvtv |
107 |
dosbin src/nvtvd |
108 |
- |
109 |
- dodoc ANNOUNCE BUGS FAQ INSTALL README \ |
110 |
- doc/USAGE doc/chips.txt doc/overview.txt \ |
111 |
- doc/timing.txt xine/tvxine |
112 |
- |
113 |
+ dodoc ANNOUNCE BUGS FAQ README doc/*.txt doc/USAGE |
114 |
newinitd "${FILESDIR}"/nvtv.start nvtv |
115 |
} |