[vlc-commits] [Git][videolan/vlc][master] 7 commits: contrib: ncurses: more config parameters in a variable

[Rémi Denis-Courmont (@Courmisch)]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
b1c3b692 by Steve Lhomme at 2022-09-27T04:42:39+00:00
contrib: ncurses: more config parameters in a variable

- - - - -
7ad929e6 by Steve Lhomme at 2022-09-27T04:42:39+00:00
contrib: ncurses: enable debug in non-optimized/debug builds

- - - - -
66506f0a by Steve Lhomme at 2022-09-27T04:42:39+00:00
contrib: ncurses: remove unknown configuration flags

- - - - -
9ad1f15f by Steve Lhomme at 2022-09-27T04:42:39+00:00
contrib: ncurses: disable more things when building

- - - - -
66a2f186 by Steve Lhomme at 2022-09-27T04:42:39+00:00
contrib: ncurses: clean configure/make calls

- - - - -
ffe13fcd by Steve Lhomme at 2022-09-27T04:42:39+00:00
contrib: ncurses: build out of tree

- - - - -
7331ccbf by Steve Lhomme at 2022-09-27T04:42:39+00:00
contrib: ncurses: add preliminary win32 support

It builds but there are some link issues in VLC.

- - - - -


2 changed files:

- + contrib/src/ncurses/ncurses-win32.patch
- contrib/src/ncurses/rules.mak


Changes:

=====================================
contrib/src/ncurses/ncurses-win32.patch
=====================================
@@ -0,0 +1,11 @@
+--- ncurses/ncurses/tinfo/lib_napms.c.orig.c	2022-09-20 09:42:37.463160900 +0200
++++ ncurses/ncurses/tinfo/lib_napms.c	2022-09-20 09:42:45.210335100 +0200
+@@ -50,6 +50,8 @@
+ #if HAVE_SYS_TIME_H
+ #include <sys/time.h>		/* needed for MacOS X DP3 */
+ #endif
++#elif defined(_NC_WINDOWS)
++#include <windows.h>
+ #endif
+ 
+ MODULE_ID("$Id: lib_napms.c,v 1.27 2020/08/15 19:45:23 tom Exp $")


=====================================
contrib/src/ncurses/rules.mak
=====================================
@@ -18,11 +18,26 @@ $(TARBALLS)/ncurses-$(NCURSES_VERSION).tar.gz:
 
 ncurses: ncurses-$(NCURSES_VERSION).tar.gz .sum-ncurses
 	$(UNPACK)
+	$(APPLY) $(SRC)/ncurses/ncurses-win32.patch
 	$(MOVE)
 
+NCURSES_CONF := --enable-widec --with-terminfo-dirs=/usr/share/terminfo \
+    --with-pkg-config=yes --enable-pc-files --without-manpages --without-tests \
+    --without-ada --without-progs
+ifdef WITH_OPTIMIZATION
+NCURSES_CONF+= --without-debug
+endif
+ifdef HAVE_WIN32
+NCURSES_CONF+= --disable-sigwinch
+endif
+
 .ncurses: ncurses
-	cd $< && mkdir -p "$(PREFIX)/lib/pkgconfig" && $(HOSTVARS) PKG_CONFIG_LIBDIR="$(PREFIX)/lib/pkgconfig" ./configure $(patsubst --datarootdir=%,,$(HOSTCONF)) --without-debug --enable-widec --without-develop --without-shared --with-terminfo-dirs=/usr/share/terminfo --with-pkg-config=yes --enable-pc-files
-	cd $< && $(MAKE) -C ncurses -j1 && $(MAKE) -C ncurses install
-	cd $< && $(MAKE) -C include -j1 && $(MAKE) -C include install
-	cd $< && $(MAKE) -C misc pc-files && cp misc/ncursesw.pc "$(PREFIX)/lib/pkgconfig"
+	$(MAKEBUILDDIR)
+	$(MAKECONFIGURE) $(NCURSES_CONF)
+	+$(MAKEBUILD) -C ncurses -j1
+	+$(MAKEBUILD) -C ncurses install
+	+$(MAKEBUILD) -C include -j1
+	+$(MAKEBUILD) -C include install
+	+$(MAKEBUILD) -C misc pc-files
+	install $</_build/misc/ncursesw.pc "$(PREFIX)/lib/pkgconfig"
 	touch $@



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/fe54d2eb257718eebfef0a5fe624771b7fac5bf0...7331ccbf455c9240c4b9407bccb8e73eb0b80781

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/fe54d2eb257718eebfef0a5fe624771b7fac5bf0...7331ccbf455c9240c4b9407bccb8e73eb0b80781
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance