Overview

Request 324 (accepted)

- Update to version 2.0.4
* LOts of bugfixes
* vlc-autoconf.patch upstream wants ncurses pkgconfig files
but none of our packages have it, use an autoconf macro
instead (fugly, let's fix ncurses later)
- Disable OSS support

Submit package home:crrodriguez:branches:Essentials / vlc to package Essentials / vlc

vlc.changes Changed
x
 
1
@@ -1,4 +1,15 @@
2
 -------------------------------------------------------------------
3
+Sun Nov 18 19:19:06 UTC 2012 - crrodriguez@opensuse.org
4
+
5
+- Update to version 2.0.4
6
+* LOts of bugfixes
7
+* vlc-autoconf.patch upstream wants ncurses pkgconfig files
8
+  but none of our packages have it, use an autoconf macro
9
+  instead (fugly, let's fix ncurses later) 
10
+
11
+- Disable OSS support
12
+
13
+-------------------------------------------------------------------
14
 Sun Oct 21 10:44:38 UTC 2012 - rwooninck@opensuse.org
15
 
16
 - Update to version 2.0.3:
17
vlc.spec Changed
51
 
1
@@ -23,8 +23,8 @@
2
 
3
 Summary:        VLC - Video Lan Client
4
 Name:           vlc
5
-Version:        2.0.3
6
-%define _version 2.0.3
7
+Version:        2.0.4
8
+%define _version 2.0.4
9
 Release:        100
10
 URL:            http://www.videolan.org/vlc/
11
 Source0:        http://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{version}.tar.xz
12
@@ -32,6 +32,7 @@
13
 Patch2:         vlc-buildcompare.patch
14
 Patch3:         0001-no-return-in-non-void.patch
15
 Patch4:         vlc-autoconf-compat.patch
16
+Patch5:        vlc-autoconf.patch
17
 License:        GPL-2.0+
18
 Group:          Productivity/Multimedia/Video/Players  
19
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
20
@@ -231,16 +232,20 @@
21
 %endif
22
 
23
 %prep
24
+%if 0%{?suse_version} < 1140
25
 %setup -c "%{name}-%{version}" -T
26
 # not all build targets have a tar that supports xz, hence do it manually:
27
 xz --decompress --stdout "%{SOURCE0}" | %__tar xf - --strip-components=1
28
+%else
29
+%setup -q 
30
+%endif
31
 %patch1
32
 %patch2
33
 %patch3 -p1
34
 %if 0%{?suse_version} < 1120
35
 %patch4
36
 %endif
37
-
38
+%patch5
39
 %build 
40
 export CFLAGS="%{optflags} -L%{_libdir}/live"
41
 export CXXFLAGS="%{optflags} -L%{_libdir}/live"
42
@@ -288,7 +293,7 @@
43
    --enable-ncurses                     \
44
    --enable-ogg                         \
45
    --enable-optimizations               \
46
-   --enable-oss                         \
47
+   --disable-oss                         \
48
    --enable-portaudio                   \
49
 %if 0%{pulseplugin}
50
    --enable-pulse                       \
51
vlc-autoconf.patch Added
567
 
1
@@ -0,0 +1,565 @@
2
+--- modules/gui/ncurses.c.orig
3
++++ modules/gui/ncurses.c
4
+@@ -40,7 +40,19 @@
5
+ #define _XOPEN_SOURCE_EXTENDED 1
6
+ #include <wchar.h>
7
+ 
8
+-#include <ncurses.h>
9
++#if defined HAVE_NCURSESW_CURSES_H
10
++     #  include <ncursesw/curses.h>
11
++     #elif defined HAVE_NCURSESW_H
12
++     #  include <ncursesw.h>
13
++     #elif defined HAVE_NCURSES_CURSES_H
14
++     #  include <ncurses/curses.h>
15
++     #elif defined HAVE_NCURSES_H
16
++     #  include <ncurses.h>
17
++     #elif defined HAVE_CURSES_H
18
++     #  include <curses.h>
19
++     #else
20
++     #  error "SysV or X/Open-compatible Curses header file required"
21
++     #endif
22
+ 
23
+ #include <vlc_interface.h>
24
+ #include <vlc_vout.h>
25
+--- /dev/null
26
++++ m4/ax_with_curses.m4
27
+@@ -0,0 +1,518 @@
28
++# ===========================================================================
29
++#      http://www.gnu.org/software/autoconf-archive/ax_with_curses.html
30
++# ===========================================================================
31
++#
32
++# SYNOPSIS
33
++#
34
++#   AX_WITH_CURSES
35
++#
36
++# DESCRIPTION
37
++#
38
++#   This macro checks whether a SysV or X/Open-compatible Curses library is
39
++#   present, along with the associated header file.  The NcursesW
40
++#   (wide-character) library is searched for first, followed by Ncurses,
41
++#   then the system-default plain Curses.  The first library found is the
42
++#   one returned.
43
++#
44
++#   The following options are understood: --with-ncursesw, --with-ncurses,
45
++#   --without-ncursesw, --without-ncurses.  The "--with" options force the
46
++#   macro to use that particular library, terminating with an error if not
47
++#   found.  The "--without" options simply skip the check for that library.
48
++#   The effect on the search pattern is:
49
++#
50
++#     (no options)                           - NcursesW, Ncurses, Curses
51
++#     --with-ncurses     --with-ncursesw     - NcursesW only [*]
52
++#     --without-ncurses  --with-ncursesw     - NcursesW only [*]
53
++#                        --with-ncursesw     - NcursesW only [*]
54
++#     --with-ncurses     --without-ncursesw  - Ncurses only [*]
55
++#     --with-ncurses                         - NcursesW, Ncurses [**]
56
++#     --without-ncurses  --without-ncursesw  - Curses only
57
++#                        --without-ncursesw  - Ncurses, Curses
58
++#     --without-ncurses                      - NcursesW, Curses
59
++#
60
++#   [*]  If the library is not found, abort the configure script.
61
++#
62
++#   [**] If the second library (Ncurses) is not found, abort configure.
63
++#
64
++#   The following preprocessor symbols may be defined by this macro if the
65
++#   appropriate conditions are met:
66
++#
67
++#     HAVE_CURSES             - if any SysV or X/Open Curses library found
68
++#     HAVE_CURSES_ENHANCED    - if library supports X/Open Enhanced functions
69
++#     HAVE_CURSES_COLOR       - if library supports color (enhanced functions)
70
++#     HAVE_CURSES_OBSOLETE    - if library supports certain obsolete features
71
++#     HAVE_NCURSESW           - if NcursesW (wide char) library is to be used
72
++#     HAVE_NCURSES            - if the Ncurses library is to be used
73
++#
74
++#     HAVE_CURSES_H           - if <curses.h> is present and should be used
75
++#     HAVE_NCURSESW_H         - if <ncursesw.h> should be used
76
++#     HAVE_NCURSES_H          - if <ncurses.h> should be used
77
++#     HAVE_NCURSESW_CURSES_H  - if <ncursesw/curses.h> should be used
78
++#     HAVE_NCURSES_CURSES_H   - if <ncurses/curses.h> should be used
79
++#
80
++#   (These preprocessor symbols are discussed later in this document.)
81
++#
82
++#   The following output variable is defined by this macro; it is precious
83
++#   and may be overridden on the ./configure command line:
84
++#
85
++#     CURSES_LIB  - library to add to xxx_LDADD
86
++#
87
++#   The library listed in CURSES_LIB is NOT added to LIBS by default. You
88
++#   need to add CURSES_LIB to the appropriate xxx_LDADD line in your
89
++#   Makefile.am.  For example:
90
++#
91
++#     prog_LDADD = @CURSES_LIB@
92
++#
93
++#   If CURSES_LIB is set on the configure command line (such as by running
94
++#   "./configure CURSES_LIB=-lmycurses"), then the only header searched for
95
++#   is <curses.h>.  The user may use the CPPFLAGS precious variable to
96
++#   override the standard #include search path.  If the user needs to
97
++#   specify an alternative path for a library (such as for a non-standard
98
++#   NcurseW), the user should use the LDFLAGS variable.
99
++#
100
++#   The following shell variables may be defined by this macro:
101
++#
102
++#     ax_cv_curses           - set to "yes" if any Curses library found
103
++#     ax_cv_curses_enhanced  - set to "yes" if Enhanced functions present
104
++#     ax_cv_curses_color     - set to "yes" if color functions present
105
++#     ax_cv_curses_obsolete  - set to "yes" if obsolete features present
106
++#
107
++#     ax_cv_ncursesw      - set to "yes" if NcursesW library found
108
++#     ax_cv_ncurses       - set to "yes" if Ncurses library found
109
++#     ax_cv_plaincurses   - set to "yes" if plain Curses library found
110
++#     ax_cv_curses_which  - set to "ncursesw", "ncurses", "plaincurses" or "no"
111
++#
112
++#   These variables can be used in your configure.ac to determine the level
113
++#   of support you need from the Curses library.  For example, if you must
114
++#   have either Ncurses or NcursesW, you could include:
115
++#
116
++#     AX_WITH_CURSES
117
++#     if test "x$ax_cv_ncursesw" != xyes && test "x$ax_cv_ncurses" != xyes; then
118
++#         AX_MSG_ERROR([requires either NcursesW or Ncurses library])
119
++#     fi
120
++#
121
++#   If any Curses library will do (but one must be present and must support
122
++#   color), you could use:
123
++#
124
++#     AX_WITH_CURSES
125
++#     if test "x$ax_cv_curses" != xyes || test "x$ax_cv_curses_color" != xyes; then
126
++#         AC_MSG_ERROR([requires an X/Open-compatible Curses library with color])
127
++#     fi
128
++#
129
++#   Certain preprocessor symbols and shell variables defined by this macro
130
++#   can be used to determine various features of the Curses library.  In
131
++#   particular, HAVE_CURSES and ax_cv_curses are defined if the Curses
132
++#   library found conforms to the traditional SysV and/or X/Open Base Curses
133
++#   definition.  Any working Curses library conforms to this level.
134
++#
135
++#   HAVE_CURSES_ENHANCED and ax_cv_curses_enhanced are defined if the
136
++#   library supports the X/Open Enhanced Curses definition.  In particular,
137
++#   the wide-character types attr_t, cchar_t and wint_t, the functions
138
++#   wattr_set() and wget_wch() and the macros WA_NORMAL and _XOPEN_CURSES
139
++#   are checked.  The Ncurses library does NOT conform to this definition,
140
++#   although NcursesW does.
141
++#
142
++#   HAVE_CURSES_COLOR and ax_cv_curses_color are defined if the library
143
++#   supports color functions and macros such as COLOR_PAIR, A_COLOR,
144
++#   COLOR_WHITE, COLOR_RED and init_pair().  These are NOT part of the
145
++#   X/Open Base Curses definition, but are part of the Enhanced set of
146
++#   functions.  The Ncurses library DOES support these functions, as does
147
++#   NcursesW.
148
++#
149
++#   HAVE_CURSES_OBSOLETE and ax_cv_curses_obsolete are defined if the
150
++#   library supports certain features present in SysV and BSD Curses but not
151
++#   defined in the X/Open definition.  In particular, the functions
152
++#   getattrs(), getcurx() and getmaxx() are checked.
153
++#
154
++#   To use the HAVE_xxx_H preprocessor symbols, insert the following into
155
++#   your system.h (or equivalent) header file:
156
++#
157
++#     #if defined HAVE_NCURSESW_CURSES_H
158
++#     #  include <ncursesw/curses.h>
159
++#     #elif defined HAVE_NCURSESW_H
160
++#     #  include <ncursesw.h>
161
++#     #elif defined HAVE_NCURSES_CURSES_H
162
++#     #  include <ncurses/curses.h>
163
++#     #elif defined HAVE_NCURSES_H
164
++#     #  include <ncurses.h>
165
++#     #elif defined HAVE_CURSES_H
166
++#     #  include <curses.h>
167
++#     #else
168
++#     #  error "SysV or X/Open-compatible Curses header file required"
169
++#     #endif
170
++#
171
++#   For previous users of this macro: you should not need to change anything
172
++#   in your configure.ac or Makefile.am, as the previous (serial 10)
173
++#   semantics are still valid.  However, you should update your system.h (or
174
++#   equivalent) header file to the fragment shown above. You are encouraged
175
++#   also to make use of the extended functionality provided by this version
176
++#   of AX_WITH_CURSES, as well as in the additional macros
177
++#   AX_WITH_CURSES_PANEL, AX_WITH_CURSES_MENU and AX_WITH_CURSES_FORM.
178
++#
179
++# LICENSE
180
++#
181
++#   Copyright (c) 2009 Mark Pulford <mark@kyne.com.au>
182
++#   Copyright (c) 2009 Damian Pietras <daper@daper.net>
183
++#   Copyright (c) 2012 Reuben Thomas <rrt@sc3d.org>
184
++#   Copyright (c) 2011 John Zaitseff <J.Zaitseff@zap.org.au>
185
++#
186
++#   This program is free software: you can redistribute it and/or modify it
187
++#   under the terms of the GNU General Public License as published by the
188
++#   Free Software Foundation, either version 3 of the License, or (at your
189
++#   option) any later version.
190
++#
191
++#   This program is distributed in the hope that it will be useful, but
192
++#   WITHOUT ANY WARRANTY; without even the implied warranty of
193
++#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
194
++#   Public License for more details.
195
++#
196
++#   You should have received a copy of the GNU General Public License along
197
++#   with this program. If not, see <http://www.gnu.org/licenses/>.
198
++#
199
++#   As a special exception, the respective Autoconf Macro's copyright owner
200
++#   gives unlimited permission to copy, distribute and modify the configure
201
++#   scripts that are the output of Autoconf when processing the Macro. You
202
++#   need not follow the terms of the GNU General Public License when using
203
++#   or distributing such scripts, even though portions of the text of the
204
++#   Macro appear in them. The GNU General Public License (GPL) does govern
205
++#   all other use of the material that constitutes the Autoconf Macro.
206
++#
207
++#   This special exception to the GPL applies to versions of the Autoconf
208
++#   Macro released by the Autoconf Archive. When you make and distribute a
209
++#   modified version of the Autoconf Macro, you may extend this special
210
++#   exception to the GPL to apply to your modified version as well.
211
++
212
++#serial 13
213
++
214
++AU_ALIAS([MP_WITH_CURSES], [AX_WITH_CURSES])
215
++AC_DEFUN([AX_WITH_CURSES], [
216
++    AC_ARG_VAR([CURSES_LIB], [linker library for Curses, e.g. -lcurses])
217
++    AC_ARG_WITH([ncurses], [AS_HELP_STRING([--with-ncurses],
218
++        [force the use of Ncurses or NcursesW])],
219
++        [], [with_ncurses=check])
220
++    AC_ARG_WITH([ncursesw], [AS_HELP_STRING([--without-ncursesw],
221
++        [do not use NcursesW (wide character support)])],
222
++        [], [with_ncursesw=check])
223
++
224
++    ax_saved_LIBS=$LIBS
225
++    AS_IF([test "x$with_ncurses" = xyes || test "x$with_ncursesw" = xyes],
226
++        [ax_with_plaincurses=no], [ax_with_plaincurses=check])
227
++
228
++    ax_cv_curses_which=no
229
++
230
++    # Test for NcursesW
231
++
232
++    AS_IF([test "x$CURSES_LIB" = x && test "x$with_ncursesw" != xno], [
233
++        LIBS="$ax_saved_LIBS -lncursesw"
234
++
235
++        AC_CACHE_CHECK([for NcursesW wide-character library], [ax_cv_ncursesw], [
236
++            AC_LINK_IFELSE([AC_LANG_CALL([], [initscr])],
237
++                [ax_cv_ncursesw=yes], [ax_cv_ncursesw=no])
238
++        ])
239
++        AS_IF([test "x$ax_cv_ncursesw" = xno && test "x$with_ncursesw" = xyes], [
240
++            AC_MSG_ERROR([--with-ncursesw specified but could not find NcursesW library])
241
++        ])
242
++
243
++        AS_IF([test "x$ax_cv_ncursesw" = xyes], [
244
++            ax_cv_curses=yes
245
++            ax_cv_curses_which=ncursesw
246
++            CURSES_LIB="-lncursesw"
247
++            AC_DEFINE([HAVE_NCURSESW], [1], [Define to 1 if the NcursesW library is present])
248
++            AC_DEFINE([HAVE_CURSES],   [1], [Define to 1 if a SysV or X/Open compatible Curses library is present])
249
++
250
++            AC_CACHE_CHECK([for working ncursesw/curses.h], [ax_cv_header_ncursesw_curses_h], [
251
++                AC_LINK_IFELSE([AC_LANG_PROGRAM([[
252
++                        @%:@define _XOPEN_SOURCE_EXTENDED 1
253
++                        @%:@include <ncursesw/curses.h>
254
++                    ]], [[
255
++                        chtype a = A_BOLD;
256
++                        int b = KEY_LEFT;
257
++                        chtype c = COLOR_PAIR(1) & A_COLOR;
258
++                        attr_t d = WA_NORMAL;
259
++                        cchar_t e;
260
++                        wint_t f;
261
++                        int g = getattrs(stdscr);
262
++                        int h = getcurx(stdscr) + getmaxx(stdscr);
263
++                        initscr();
264
++                        init_pair(1, COLOR_WHITE, COLOR_RED);
265
++                        wattr_set(stdscr, d, 0, NULL);
266
++                        wget_wch(stdscr, &f);
267
++                    ]])],
268
++                    [ax_cv_header_ncursesw_curses_h=yes],
269
++                    [ax_cv_header_ncursesw_curses_h=no])
270
++            ])
271
++            AS_IF([test "x$ax_cv_header_ncursesw_curses_h" = xyes], [
272
++                ax_cv_curses_enhanced=yes
273
++                ax_cv_curses_color=yes
274
++                ax_cv_curses_obsolete=yes
275
++                AC_DEFINE([HAVE_CURSES_ENHANCED],   [1], [Define to 1 if library supports X/Open Enhanced functions])
276
++                AC_DEFINE([HAVE_CURSES_COLOR],      [1], [Define to 1 if library supports color (enhanced functions)])
277
++                AC_DEFINE([HAVE_CURSES_OBSOLETE],   [1], [Define to 1 if library supports certain obsolete features])
278
++                AC_DEFINE([HAVE_NCURSESW_CURSES_H], [1], [Define to 1 if <ncursesw/curses.h> is present])
279
++            ])
280
++
281
++            AC_CACHE_CHECK([for working ncursesw.h], [ax_cv_header_ncursesw_h], [
282
++                AC_LINK_IFELSE([AC_LANG_PROGRAM([[
283
++                        @%:@define _XOPEN_SOURCE_EXTENDED 1
284
++                        @%:@include <ncursesw.h>
285
++                    ]], [[
286
++                        chtype a = A_BOLD;
287
++                        int b = KEY_LEFT;
288
++                        chtype c = COLOR_PAIR(1) & A_COLOR;
289
++                        attr_t d = WA_NORMAL;
290
++                        cchar_t e;
291
++                        wint_t f;
292
++                        int g = getattrs(stdscr);
293
++                        int h = getcurx(stdscr) + getmaxx(stdscr);
294
++                        initscr();
295
++                        init_pair(1, COLOR_WHITE, COLOR_RED);
296
++                        wattr_set(stdscr, d, 0, NULL);
297
++                        wget_wch(stdscr, &f);
298
++                    ]])],
299
++                    [ax_cv_header_ncursesw_h=yes],
300
++                    [ax_cv_header_ncursesw_h=no])
301
++            ])
302
++            AS_IF([test "x$ax_cv_header_ncursesw_h" = xyes], [
303
++                ax_cv_curses_enhanced=yes
304
++                ax_cv_curses_color=yes
305
++                ax_cv_curses_obsolete=yes
306
++                AC_DEFINE([HAVE_CURSES_ENHANCED], [1], [Define to 1 if library supports X/Open Enhanced functions])
307
++                AC_DEFINE([HAVE_CURSES_COLOR],    [1], [Define to 1 if library supports color (enhanced functions)])
308
++                AC_DEFINE([HAVE_CURSES_OBSOLETE], [1], [Define to 1 if library supports certain obsolete features])
309
++                AC_DEFINE([HAVE_NCURSESW_H],      [1], [Define to 1 if <ncursesw.h> is present])
310
++            ])
311
++
312
++            AC_CACHE_CHECK([for working ncurses.h], [ax_cv_header_ncurses_h_with_ncursesw], [
313
++                AC_LINK_IFELSE([AC_LANG_PROGRAM([[
314
++                        @%:@define _XOPEN_SOURCE_EXTENDED 1
315
++                        @%:@include <ncurses.h>
316
++                    ]], [[
317
++                        chtype a = A_BOLD;
318
++                        int b = KEY_LEFT;
319
++                        chtype c = COLOR_PAIR(1) & A_COLOR;
320
++                        attr_t d = WA_NORMAL;
321
++                        cchar_t e;
322
++                        wint_t f;
323
++                        int g = getattrs(stdscr);
324
++                        int h = getcurx(stdscr) + getmaxx(stdscr);
325
++                        initscr();
326
++                        init_pair(1, COLOR_WHITE, COLOR_RED);
327
++                        wattr_set(stdscr, d, 0, NULL);
328
++                        wget_wch(stdscr, &f);
329
++                    ]])],
330
++                    [ax_cv_header_ncurses_h_with_ncursesw=yes],
331
++                    [ax_cv_header_ncurses_h_with_ncursesw=no])
332
++            ])
333
++            AS_IF([test "x$ax_cv_header_ncurses_h_with_ncursesw" = xyes], [
334
++                ax_cv_curses_enhanced=yes
335
++                ax_cv_curses_color=yes
336
++                ax_cv_curses_obsolete=yes
337
++                AC_DEFINE([HAVE_CURSES_ENHANCED], [1], [Define to 1 if library supports X/Open Enhanced functions])
338
++                AC_DEFINE([HAVE_CURSES_COLOR],    [1], [Define to 1 if library supports color (enhanced functions)])
339
++                AC_DEFINE([HAVE_CURSES_OBSOLETE], [1], [Define to 1 if library supports certain obsolete features])
340
++                AC_DEFINE([HAVE_NCURSES_H],       [1], [Define to 1 if <ncurses.h> is present])
341
++            ])
342
++
343
++            AS_IF([test "x$ax_cv_header_ncursesw_curses_h" = xno && test "x$ax_cv_header_ncursesw_h" = xno && test "x$ax_cv_header_ncurses_h_with_ncursesw" = xno], [
344
++                AC_MSG_WARN([could not find a working ncursesw/curses.h, ncursesw.h or ncurses.h])
345
++            ])
346
++        ])
347
++    ])
348
++
349
++    # Test for Ncurses
350
++
351
++    AS_IF([test "x$CURSES_LIB" = x && test "x$with_ncurses" != xno && test "x$ax_cv_curses_which" = xno], [
352
++        LIBS="$ax_saved_LIBS -lncurses"
353
++
354
++        AC_CACHE_CHECK([for Ncurses library], [ax_cv_ncurses], [
355
++            AC_LINK_IFELSE([AC_LANG_CALL([], [initscr])],
356
++                [ax_cv_ncurses=yes], [ax_cv_ncurses=no])
357
++        ])
358
++        AS_IF([test "x$ax_cv_ncurses" = xno && test "x$with_ncurses" = xyes], [
359
++            AC_MSG_ERROR([--with-ncurses specified but could not find Ncurses library])
360
++        ])
361
++
362
++        AS_IF([test "x$ax_cv_ncurses" = xyes], [
363
++            ax_cv_curses=yes
364
++            ax_cv_curses_which=ncurses
365
++            CURSES_LIB="-lncurses"
366
++            AC_DEFINE([HAVE_NCURSES], [1], [Define to 1 if the Ncurses library is present])
367
++            AC_DEFINE([HAVE_CURSES],  [1], [Define to 1 if a SysV or X/Open compatible Curses library is present])
368
++
369
++            AC_CACHE_CHECK([for working ncurses/curses.h], [ax_cv_header_ncurses_curses_h], [
370
++                AC_LINK_IFELSE([AC_LANG_PROGRAM([[
371
++                        @%:@include <ncurses/curses.h>
372
++                    ]], [[
373
++                        chtype a = A_BOLD;
374
++                        int b = KEY_LEFT;
375
++                        chtype c = COLOR_PAIR(1) & A_COLOR;
376
++                        int g = getattrs(stdscr);
377
++                        int h = getcurx(stdscr) + getmaxx(stdscr);
378
++                        initscr();
379
++                        init_pair(1, COLOR_WHITE, COLOR_RED);
380
++                    ]])],
381
++                    [ax_cv_header_ncurses_curses_h=yes],
382
++                    [ax_cv_header_ncurses_curses_h=no])
383
++            ])
384
++            AS_IF([test "x$ax_cv_header_ncurses_curses_h" = xyes], [
385
++                ax_cv_curses_color=yes
386
++                ax_cv_curses_obsolete=yes
387
++                AC_DEFINE([HAVE_CURSES_COLOR],     [1], [Define to 1 if library supports color (enhanced functions)])
388
++                AC_DEFINE([HAVE_CURSES_OBSOLETE],  [1], [Define to 1 if library supports certain obsolete features])
389
++                AC_DEFINE([HAVE_NCURSES_CURSES_H], [1], [Define to 1 if <ncurses/curses.h> is present])
390
++            ])
391
++
392
++            AC_CACHE_CHECK([for working ncurses.h], [ax_cv_header_ncurses_h], [
393
++                AC_LINK_IFELSE([AC_LANG_PROGRAM([[
394
++                        @%:@include <ncurses.h>
395
++                    ]], [[
396
++                        chtype a = A_BOLD;
397
++                        int b = KEY_LEFT;
398
++                        chtype c = COLOR_PAIR(1) & A_COLOR;
399
++                        int g = getattrs(stdscr);
400
++                        int h = getcurx(stdscr) + getmaxx(stdscr);
401
++                        initscr();
402
++                        init_pair(1, COLOR_WHITE, COLOR_RED);
403
++                    ]])],
404
++                    [ax_cv_header_ncurses_h=yes],
405
++                    [ax_cv_header_ncurses_h=no])
406
++            ])
407
++            AS_IF([test "x$ax_cv_header_ncurses_h" = xyes], [
408
++                ax_cv_curses_color=yes
409
++                ax_cv_curses_obsolete=yes
410
++                AC_DEFINE([HAVE_CURSES_COLOR],    [1], [Define to 1 if library supports color (enhanced functions)])
411
++                AC_DEFINE([HAVE_CURSES_OBSOLETE], [1], [Define to 1 if library supports certain obsolete features])
412
++                AC_DEFINE([HAVE_NCURSES_H],       [1], [Define to 1 if <ncurses.h> is present])
413
++            ])
414
++
415
++            AS_IF([test "x$ax_cv_header_ncurses_curses_h" = xno && test "x$ax_cv_header_ncurses_h" = xno], [
416
++                AC_MSG_WARN([could not find a working ncurses/curses.h or ncurses.h])
417
++            ])
418
++        ])
419
++    ])
420
++
421
++    # Test for plain Curses (or if CURSES_LIB was set by user)
422
++
423
++    AS_IF([test "x$with_plaincurses" != xno && test "x$ax_cv_curses_which" = xno], [
424
++        AS_IF([test "x$CURSES_LIB" != x], [
425
++            LIBS="$ax_saved_LIBS $CURSES_LIB"
426
++        ], [
427
++            LIBS="$ax_saved_LIBS -lcurses"
428
++        ])
429
++
430
++        AC_CACHE_CHECK([for Curses library], [ax_cv_plaincurses], [
431
++            AC_LINK_IFELSE([AC_LANG_CALL([], [initscr])],
432
++                [ax_cv_plaincurses=yes], [ax_cv_plaincurses=no])
433
++        ])
434
++
435
++        AS_IF([test "x$ax_cv_plaincurses" = xyes], [
436
++            ax_cv_curses=yes
437
++            ax_cv_curses_which=plaincurses
438
++            AS_IF([test "x$CURSES_LIB" = x], [
439
++                CURSES_LIB="-lcurses"
440
++            ])
441
++            AC_DEFINE([HAVE_CURSES], [1], [Define to 1 if a SysV or X/Open compatible Curses library is present])
442
++
443
++            # Check for base conformance (and header file)
444
++
445
++            AC_CACHE_CHECK([for working curses.h], [ax_cv_header_curses_h], [
446
++                AC_LINK_IFELSE([AC_LANG_PROGRAM([[
447
++                        @%:@include <curses.h>
448
++                    ]], [[
449
++                        chtype a = A_BOLD;
450
++                        int b = KEY_LEFT;
451
++                        initscr();
452
++                    ]])],
453
++                    [ax_cv_header_curses_h=yes],
454
++                    [ax_cv_header_curses_h=no])
455
++            ])
456
++            AS_IF([test "x$ax_cv_header_curses_h" = xyes], [
457
++                AC_DEFINE([HAVE_CURSES_H], [1], [Define to 1 if <curses.h> is present])
458
++
459
++                # Check for X/Open Enhanced conformance
460
++
461
++                AC_CACHE_CHECK([for X/Open Enhanced Curses conformance], [ax_cv_plaincurses_enhanced], [
462
++                    AC_LINK_IFELSE([AC_LANG_PROGRAM([[
463
++                            @%:@define _XOPEN_SOURCE_EXTENDED 1
464
++                            @%:@include <curses.h>
465
++                            @%:@ifndef _XOPEN_CURSES
466
++                            @%:@error "this Curses library is not enhanced"
467
++                            "this Curses library is not enhanced"
468
++                            @%:@endif
469
++                        ]], [[
470
++                            chtype a = A_BOLD;
471
++                            int b = KEY_LEFT;
472
++                            chtype c = COLOR_PAIR(1) & A_COLOR;
473
++                            attr_t d = WA_NORMAL;
474
++                            cchar_t e;
475
++                            wint_t f;
476
++                            initscr();
477
++                            init_pair(1, COLOR_WHITE, COLOR_RED);
478
++                            wattr_set(stdscr, d, 0, NULL);
479
++                            wget_wch(stdscr, &f);
480
++                        ]])],
481
++                        [ax_cv_plaincurses_enhanced=yes],
482
++                        [ax_cv_plaincurses_enhanced=no])
483
++                ])
484
++                AS_IF([test "x$ax_cv_plaincurses_enhanced" = xyes], [
485
++                    ax_cv_curses_enhanced=yes
486
++                    ax_cv_curses_color=yes
487
++                    AC_DEFINE([HAVE_CURSES_ENHANCED], [1], [Define to 1 if library supports X/Open Enhanced functions])
488
++                    AC_DEFINE([HAVE_CURSES_COLOR],    [1], [Define to 1 if library supports color (enhanced functions)])
489
++                ])
490
++
491
++                # Check for color functions
492
++
493
++                AC_CACHE_CHECK([for Curses color functions], [ax_cv_plaincurses_color], [
494
++                    AC_LINK_IFELSE([AC_LANG_PROGRAM([[
495
++                        @%:@define _XOPEN_SOURCE_EXTENDED 1
496
++                        @%:@include <curses.h>
497
++                        ]], [[
498
++                            chtype a = A_BOLD;
499
++                            int b = KEY_LEFT;
500
++                            chtype c = COLOR_PAIR(1) & A_COLOR;
501
++                            initscr();
502
++                            init_pair(1, COLOR_WHITE, COLOR_RED);
503
++                        ]])],
504
++                        [ax_cv_plaincurses_color=yes],
505
++                        [ax_cv_plaincurses_color=no])
506
++                ])
507
++                AS_IF([test "x$ax_cv_plaincurses_color" = xyes], [
508
++                    ax_cv_curses_color=yes
509
++                    AC_DEFINE([HAVE_CURSES_COLOR], [1], [Define to 1 if library supports color (enhanced functions)])
510
++                ])
511
++
512
++                # Check for obsolete functions
513
++
514
++                AC_CACHE_CHECK([for obsolete Curses functions], [ax_cv_plaincurses_obsolete], [
515
++                AC_LINK_IFELSE([AC_LANG_PROGRAM([[
516
++                        @%:@include <curses.h>
517
++                    ]], [[
518
++                        chtype a = A_BOLD;
519
++                        int b = KEY_LEFT;
520
++                        int g = getattrs(stdscr);
521
++                        int h = getcurx(stdscr) + getmaxx(stdscr);
522
++                        initscr();
523
++                    ]])],
524
++                    [ax_cv_plaincurses_obsolete=yes],
525
++                    [ax_cv_plaincurses_obsolete=no])
526
++                ])
527
++                AS_IF([test "x$ax_cv_plaincurses_obsolete" = xyes], [
528
++                    ax_cv_curses_obsolete=yes
529
++                    AC_DEFINE([HAVE_CURSES_OBSOLETE], [1], [Define to 1 if library supports certain obsolete features])
530
++                ])
531
++            ])
532
++
533
++            AS_IF([test "x$ax_cv_header_curses_h" = xno], [
534
++                AC_MSG_WARN([could not find a working curses.h])
535
++            ])
536
++        ])
537
++    ])
538
++
539
++    AS_IF([test "x$ax_cv_curses"          != xyes], [ax_cv_curses=no])
540
++    AS_IF([test "x$ax_cv_curses_enhanced" != xyes], [ax_cv_curses_enhanced=no])
541
++    AS_IF([test "x$ax_cv_curses_color"    != xyes], [ax_cv_curses_color=no])
542
++    AS_IF([test "x$ax_cv_curses_obsolete" != xyes], [ax_cv_curses_obsolete=no])
543
++
544
++    LIBS=$ax_saved_LIBS
545
++])dnl
546
+--- configure.ac.orig
547
++++ configure.ac
548
+@@ -3803,16 +3803,10 @@ dnl
549
+ AC_ARG_ENABLE(ncurses,
550
+ [AS_HELP_STRING([--disable-ncurses],[ncurses text-based interface (default auto)])])
551
+ AS_IF([test "${enable_ncurses}" != "no"] ,[
552
+-  PKG_CHECK_MODULES([NCURSES], [ncursesw], [
553
++    AX_WITH_CURSES
554
+     VLC_ADD_PLUGIN([ncurses])
555
+-    VLC_ADD_CFLAGS([ncurses],[${NCURSES_CFLAGS}])
556
+-    VLC_ADD_LIBS([ncurses],[${NCURSES_LIBS}])
557
++    VLC_ADD_LIBS([ncurses],[${CURSES_LIB}])
558
+     ALIASES="${ALIASES} nvlc"
559
+-  ], [
560
+-    AS_IF([test -n "${enable_ncurses}"], [
561
+-      AC_MSG_ERROR([${NCURSES_PKG_ERRORS}.])
562
+-    ])
563
+-  ])
564
+ ])
565
+ 
566
+ dnl
567
_service Deleted
7
 
1
@@ -1,4 +0,0 @@
2
-<services>
3
-  <service name="download_url">
4
-  <param name="path">/pub/videolan/vlc/2.0.3/vlc-2.0.3.tar.xz</param><param name="host">download.videolan.org</param><param name="protocol">http</param></service>
5
-</services>
6
\ No newline at end of file
7
_service:download_url:vlc-2.0.3.tar.xz Deleted
vlc-2.0.4.tar.xz Added
Refresh

No build results available

Refresh

No rpmlint results available

Request History
crrodriguez's avatar

crrodriguez created request over 11 years ago

- Update to version 2.0.4
* LOts of bugfixes
* vlc-autoconf.patch upstream wants ncurses pkgconfig files
but none of our packages have it, use an autoconf macro
instead (fugly, let's fix ncurses later)
- Disable OSS support