AndroWish: Check-in [82d11a9e50]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview

Comment:	merge with trunk
Timelines:	family \| ancestors \| descendants \| both \| wtf-8-experiment
Files:	files \| file ages \| folders
SHA1:	82d11a9e50bce5b1fde53186d902e49affddf0c7
User & Date:	chw 2019-02-14 06:12:58.544

Context

2019-02-14
06:21		merge with trunk check-in: 8c417142d2 user: chw tags: wtf-8-experiment
06:12		merge with trunk check-in: 82d11a9e50 user: chw tags: wtf-8-experiment
06:10		build undroidwish for MacOS with experimental jsmpeg SDL video driver plus other changes check-in: 8722b3746c user: chw tags: trunk
2019-02-13
18:39		merge with trunk check-in: 8cacd3399f user: chw tags: wtf-8-experiment

Changes

Changes to jni/SDL2/configure.

Changes to jni/SDL2/configure.in.

Changes to jni/SDL2/src/video/SDL_video.c.

Changes to jni/SDL2/src/video/jsmpeg/SDL_jsmpeg.c.

Changes to jni/SDL2/src/video/jsmpeg/SDL_jsmpeg_files.h.

Changes to jni/SDL2/src/video/jsmpeg/genfiles.sh.

Changes to jni/sdl2tk/sdl/SdlTkX.c.

Changes to undroid/README.txt.

Changes to undroid/build-undroidwish-kmsdrm.sh.

Changes to undroid/build-undroidwish-macosx.sh.

Changes to undroid/build-undroidwish-wayland.sh.

︙			︙
5438 5439 5440 5441 5442 5443 5444 5445 5446 5447 5448 5449 5450 5451	int initMask = SDL_INIT_VIDEO \| SDL_INIT_JOYSTICK; #ifndef ANDROID int tfmt = SDL_PIXELFORMAT_RGB888; #endif #ifdef linux int setQuit = 0, checkInput = 0; char p; #endif XGCValues values; #ifdef AGG_CUSTOM_ALLOCATOR / Init AGG custom allocator functions. / agg_custom_alloc = (void ()(unsigned int)) Tcl_Alloc; agg_custom_free = (void ()(void *)) Tcl_Free;	> >	5438 5439 5440 5441 5442 5443 5444 5445 5446 5447 5448 5449 5450 5451 5452 5453	int initMask = SDL_INIT_VIDEO \| SDL_INIT_JOYSTICK; #ifndef ANDROID int tfmt = SDL_PIXELFORMAT_RGB888; #endif #ifdef linux int setQuit = 0, checkInput = 0; char p; #elif defined(__APPLE__) char p; #endif XGCValues values; #ifdef AGG_CUSTOM_ALLOCATOR /* Init AGG custom allocator functions. / agg_custom_alloc = (void ()(unsigned int)) Tcl_Alloc; agg_custom_free = (void ()(void *)) Tcl_Free;
︙			︙
5557 5558 5559 5560 5561 5562 5563 5564 5565 5566 5567 5568 5569 5570	SdlTkX.arg_nogl = 1; SdlTkX.arg_swcursor = 1; } if (CheckGroups(checkInput) < 0) { SDL_LogCritical(SDL_LOG_CATEGORY_APPLICATION, "Permission problem, exiting"); goto fatal; } #endif SDL_SetHint(SDL_HINT_NO_SIGNAL_HANDLERS, "1"); retryInit: #endif if (SDL_Init(initMask) < 0) { #ifdef ANDROID	> > > > > > > > >	5559 5560 5561 5562 5563 5564 5565 5566 5567 5568 5569 5570 5571 5572 5573 5574 5575 5576 5577 5578 5579 5580 5581	SdlTkX.arg_nogl = 1; SdlTkX.arg_swcursor = 1; } if (CheckGroups(checkInput) < 0) { SDL_LogCritical(SDL_LOG_CATEGORY_APPLICATION, "Permission problem, exiting"); goto fatal; } #elif defined(__APPLE__) p = getenv("SDL_VIDEODRIVER"); if ((p != NULL) && (p[0] != '\0')) { if (strcmp(p, "jsmpeg") == 0) { SdlTkX.arg_nogl = 1; SdlTkX.arg_swcursor = 1; setenv("SDL_RENDER_DRIVER", "software", 1); } } #endif SDL_SetHint(SDL_HINT_NO_SIGNAL_HANDLERS, "1"); retryInit: #endif if (SDL_Init(initMask) < 0) { #ifdef ANDROID
︙			︙

︙			︙
83 84 85 86 87 88 89 90 91 92 93 94 95 96	populated by the "init" action. The disk space needed for a full build per platform is 700 to 900 MByte on a Linux development system. On Debian GNU/Linux and derivates, these packages should be present for building (more may be required): bc libasound2-dev libaugeas-dev libcairo2-dev libdbus-1-dev libfontconfig1-dev libfreetype6-dev libgbm-dev	>	83 84 85 86 87 88 89 90 91 92 93 94 95 96 97	populated by the "init" action. The disk space needed for a full build per platform is 700 to 900 MByte on a Linux development system. On Debian GNU/Linux and derivates, these packages should be present for building (more may be required): bc cmake libasound2-dev libaugeas-dev libcairo2-dev libdbus-1-dev libfontconfig1-dev libfreetype6-dev libgbm-dev
︙			︙
109 110 111 112 113 114 115 116 117 118 119 120	zip zlib1g-dev On MacOSX these homebrew packages are needed for building (more may be required): augeas dbus libusb nasm pkgconfig	> >	110 111 112 113 114 115 116 117 118 119 120 121 122 123	zip zlib1g-dev On MacOSX these homebrew packages are needed for building (more may be required): augeas cmake dbus ffmpeg libusb nasm pkgconfig

︙			︙
77 78 79 80 81 82 83 84 85 86 87 88 89 90 91	CC="cc -DTCL_UTF_MAX=3" CXX="c++ -fno-exceptions -fno-rtti -DTCL_UTF_MAX=3" NM=nm # RPATH for binaries ADD_RPATH="/Applications/VLC.app/Contents/MacOS/lib" export STRIP AR RANLIB CC CXX RC NM ADD_RPATH ~~SUBDIRS="tcl libressl zlib curl tcludp tdom tclvfs tclkit trofs tbcload ~~tls~~"~~ SUBDIRS="${SUBDIRS} Memchan TclCurl freetype SDL2 sdl2tk blt jpeg-turbo" SUBDIRS="${SUBDIRS} 3dcanvas tkimg trf tktable tktreectrl tkpath itk tkhtml" SUBDIRS="${SUBDIRS} dbus-tcl dbus-intf tclx libdmtx ZBar zint tcl-augeas" SUBDIRS="${SUBDIRS} snack tkvnc tksvg VecTcl tclral" SUBDIRS="${SUBDIRS} tclepeg tcluvc xotcl nsf vu rl_json mpexpr" SUBDIRS="${SUBDIRS} tclcsv tkzinc libffi ffidl tcl-lmdb DiffUtilTcl" SUBDIRS="${SUBDIRS} tclparser tclcompiler tserialport topcua parse_args tkvlc"	\| >	77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92	CC="cc -DTCL_UTF_MAX=3" CXX="c++ -fno-exceptions -fno-rtti -DTCL_UTF_MAX=3" NM=nm # RPATH for binaries ADD_RPATH="/Applications/VLC.app/Contents/MacOS/lib" export STRIP AR RANLIB CC CXX RC NM ADD_RPATH SUBDIRS="tcl libressl zlib curl tcludp tdom tclvfs tclkit trofs tbcload" SUBDIRS="${SUBDIRS} tls libwebsockets" SUBDIRS="${SUBDIRS} Memchan TclCurl freetype SDL2 sdl2tk blt jpeg-turbo" SUBDIRS="${SUBDIRS} 3dcanvas tkimg trf tktable tktreectrl tkpath itk tkhtml" SUBDIRS="${SUBDIRS} dbus-tcl dbus-intf tclx libdmtx ZBar zint tcl-augeas" SUBDIRS="${SUBDIRS} snack tkvnc tksvg VecTcl tclral" SUBDIRS="${SUBDIRS} tclepeg tcluvc xotcl nsf vu rl_json mpexpr" SUBDIRS="${SUBDIRS} tclcsv tkzinc libffi ffidl tcl-lmdb DiffUtilTcl" SUBDIRS="${SUBDIRS} tclparser tclcompiler tserialport topcua parse_args tkvlc"
︙			︙
127 128 129 130 131 132 133 134 135 136 137 138 139 140	xotcl\|nsf) rm -f ${i}/.o ${i}/generic/stubs/.o rm -f ${i}/build-stamp ;; mpexpr) rm -f ${i}/unix/build-stamp ;; ) rm -f ${i}/build-stamp ;; esac done }	> > >	128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144	xotcl\|nsf) rm -f ${i}/.o ${i}/generic/stubs/.o rm -f ${i}/build-stamp ;; mpexpr) rm -f ${i}/unix/build-stamp ;; libwebsockets) rm -f ${i}/build/build-stamp ;; ) rm -f ${i}/build-stamp ;; esac done }
︙			︙
239 240 241 242 243 244 245 246 247 248 249 250 251 252	;; tdom) ( exec >> build.log 2>&1 make -C tdom ${ACTION} \|\| true make -C tdom/extensions/tnc ${ACTION} \|\| true ) \|\| true ;; *) ( exec >> build.log 2>&1 make -C $i ${ACTION} \|\| true ) \|\| true ;;	> > > > > >	243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262	;; tdom) ( exec >> build.log 2>&1 make -C tdom ${ACTION} \|\| true make -C tdom/extensions/tnc ${ACTION} \|\| true ) \|\| true ;; libwebsockets) ( exec >> build.log 2>&1 rm -rf libwebsockets/build ) \|\| true ;; *) ( exec >> build.log 2>&1 make -C $i ${ACTION} \|\| true ) \|\| true ;;
︙			︙
542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 ~~558~~ 559 560 561 ~~562~~ 563 564 565 566 567 568 569	perl -ni -e 'print unless /t42_driver/' objs/ftmodule.h perl -ni -e 'print unless /winfnt_driver/' objs/ftmodule.h make \|\| exit 1 make install \|\| exit 1 touch build-stamp echo >&3 "done" ) \|\| fail echo -n "build SDL2 (static, pic) ... " ( exec 3>&1 exec >> build.log 2>&1 CC="$CC -fPIC" CXX="$CXX -fPIC" cd SDL2 test -e build-stamp && echo >&3 "already done" && exit 0 ~~./configure --prefix=${PFX_HERE} \~~ --disable-shared --disable-arts --disable-esd --disable-nas \ --disable-ibus --enable-alsa --disable-video-x11 \ --disable-rpath --disable-video-opengles2 \ ~~--disable-video-vulkan \|\| exit 1~~ make \|\| exit 1 make install \|\| exit 1 touch build-stamp echo >&3 "done" ) \|\| fail echo -n "build Tk (SDL2 backend, static) ... "	> > > > > > > > > > > > > > > > > > \| \|	552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597	perl -ni -e 'print unless /t42_driver/' objs/ftmodule.h perl -ni -e 'print unless /winfnt_driver/' objs/ftmodule.h make \|\| exit 1 make install \|\| exit 1 touch build-stamp echo >&3 "done" ) \|\| fail echo -n "build libwebsockets (static, pic) ..." ( exec 3>&1 exec >> build.log 2>&1 CC="$CC -fPIC" CXX="$CXX -fPIC" mkdir -p libwebsockets/build cd libwebsockets/build test -e build-stamp && echo >&3 "already done" && exit 0 cmake .. -DCMAKE_INSTALL_PREFIX=${PFX_HERE}/extra \ -DLWS_IPV6=ON -DLWS_WITH_SHARED=OFF -DLWS_WITH_SSL=OFF \|\| exit 1 make VERBOSE=1 COLOR=0 \|\| exit 1 make VERBOSE=1 COLOR=0 install \|\| exit 1 touch build-stamp echo >&3 "done" ) \|\| fail echo -n "build SDL2 (static, pic) ... " ( exec 3>&1 exec >> build.log 2>&1 CC="$CC -fPIC" CXX="$CXX -fPIC" cd SDL2 test -e build-stamp && echo >&3 "already done" && exit 0 PKG_CONFIG_PATH=${PFX_HERE}/extra/lib/pkgconfig \ ./configure --prefix=${PFX_HERE} \ --disable-shared --disable-arts --disable-esd --disable-nas \ --disable-ibus --enable-alsa --disable-video-x11 \ --disable-rpath --disable-video-opengles2 \ --disable-video-vulkan --enable-video-jsmpeg \|\| exit 1 make \|\| exit 1 make install \|\| exit 1 touch build-stamp echo >&3 "done" ) \|\| fail echo -n "build Tk (SDL2 backend, static) ... "
︙			︙