Check-in [22ec538f4d]
Not logged in

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

Overview
Comment:use internally built libwebsockets for Wayland and KMSDRM undroidwishes
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 22ec538f4d2c13b12b247b12741fb4a583f58c17
User & Date: chw 2019-02-13 18:33:06
Original Comment: use internally build libwebsockets for wayland and ksmdrm undroidwishes
Context
2019-02-14
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
18:33
use internally built libwebsockets for Wayland and KMSDRM undroidwishes check-in: 22ec538f4d user: chw tags: trunk
18:27
in experimental jsmpeg SDL video driver use runtime linking of ffmpeg libs check-in: 52df327807 user: chw tags: trunk
Changes

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

75
76
77
78
79
80
81
82

83
84
85
86
87
88
89
...
130
131
132
133
134
135
136



137
138
139
140
141
142
143
...
248
249
250
251
252
253
254






255
256
257
258
259
260
261
...
581
582
583
584
585
586
587
















588
589
590
591
592
593
594
595
596
597

598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
AR=ar
RANLIB=ranlib
CC="gcc -DTCL_UTF_MAX=6"
CXX="g++ -fno-exceptions -fno-rtti -DTCL_UTF_MAX=6"
NM=nm
export STRIP AR RANLIB CC CXX RC NM

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 v4l2"
SUBDIRS="${SUBDIRS} tkhtml dbus-tcl dbus-intf tclx libdmtx ZBar zint"
SUBDIRS="${SUBDIRS} tcl-augeas snack tkvnc tksvg VecTcl tclral"
SUBDIRS="${SUBDIRS} tclepeg tcluvc xotcl nsf libsocketcan tclcan vu"
SUBDIRS="${SUBDIRS} rl_json mpexpr"
SUBDIRS="${SUBDIRS} tclcsv tkzinc libffi ffidl tcl-lmdb DiffUtilTcl"
................................................................................
        ;;
      mpexpr)
        rm -f ${i}/unix/build-stamp
        ;;
      snap7)
        rm -f ${i}/build/unix/build-stamp
        ;;



      *)
        rm -f ${i}/build-stamp
        ;;
     esac
  done
}

................................................................................
        ) || true
        ;;
      snap7)
        (
          exec >> build.log 2>&1
          make -C snap7/build/unix -f unix.mk clean || true
        ) || true






        ;;
      *)
        (
          exec >> build.log 2>&1
          make -C $i ${ACTION} || true
        ) || true
        ;;
................................................................................
  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
  # Enabled video drivers: KMSDRM only

  ./configure --prefix=${PFX_HERE} \
    --disable-shared --disable-arts --disable-esd --disable-nas \
    --enable-pulseaudio-shared --enable-alsa --disable-rpath \
    --disable-video-wayland --disable-video-wayland-qt-touch \
    --disable-video-x11 --enable-video-opengles --enable-video-opengles2 \
    --enable-video-opengles1 --enable-video-kmsdrm \
    --disable-video-vulkan --disable-video-mir --enable-video-jsmpeg \
    --disable-fcitx || exit 1
  make || exit 1
  make install || exit 1
  touch build-stamp
  echo >&3 "done"
) || fail

echo -n "build Tk (SDL2 backend, static) ... "







|
>







 







>
>
>







 







>
>
>
>
>
>







 







>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>










>
|
|
|
|
|
|
|
|







75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
...
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
...
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
...
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
AR=ar
RANLIB=ranlib
CC="gcc -DTCL_UTF_MAX=6"
CXX="g++ -fno-exceptions -fno-rtti -DTCL_UTF_MAX=6"
NM=nm
export STRIP AR RANLIB CC CXX RC NM

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 v4l2"
SUBDIRS="${SUBDIRS} tkhtml dbus-tcl dbus-intf tclx libdmtx ZBar zint"
SUBDIRS="${SUBDIRS} tcl-augeas snack tkvnc tksvg VecTcl tclral"
SUBDIRS="${SUBDIRS} tclepeg tcluvc xotcl nsf libsocketcan tclcan vu"
SUBDIRS="${SUBDIRS} rl_json mpexpr"
SUBDIRS="${SUBDIRS} tclcsv tkzinc libffi ffidl tcl-lmdb DiffUtilTcl"
................................................................................
        ;;
      mpexpr)
        rm -f ${i}/unix/build-stamp
        ;;
      snap7)
        rm -f ${i}/build/unix/build-stamp
        ;;
      libwebsockets)
        rm -f ${i}/build/build-stamp
	;;
      *)
        rm -f ${i}/build-stamp
        ;;
     esac
  done
}

................................................................................
        ) || true
        ;;
      snap7)
        (
          exec >> build.log 2>&1
          make -C snap7/build/unix -f unix.mk clean || true
        ) || true
        ;;
      libwebsockets)
        (
          exec >> build.log 2>&1
          rm -rf libwebsockets/build
        ) || true
        ;;
      *)
        (
          exec >> build.log 2>&1
          make -C $i ${ACTION} || true
        ) || true
        ;;
................................................................................
  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
  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
  # Enabled video drivers: KMSDRM only
  PKG_CONFIG_PATH="${PFX_HERE}/extra/lib/pkgconfig" \
    ./configure --prefix=${PFX_HERE} \
      --disable-shared --disable-arts --disable-esd --disable-nas \
      --enable-pulseaudio-shared --enable-alsa --disable-rpath \
      --disable-video-wayland --disable-video-wayland-qt-touch \
      --disable-video-x11 --enable-video-opengles --enable-video-opengles2 \
      --enable-video-opengles1 --enable-video-kmsdrm \
      --disable-video-vulkan --disable-video-mir --enable-video-jsmpeg \
      --disable-fcitx || exit 1
  make || exit 1
  make install || exit 1
  touch build-stamp
  echo >&3 "done"
) || fail

echo -n "build Tk (SDL2 backend, static) ... "

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

75
76
77
78
79
80
81
82

83
84
85
86
87
88
89
...
130
131
132
133
134
135
136



137
138
139
140
141
142
143
...
248
249
250
251
252
253
254






255
256
257
258
259
260
261
...
581
582
583
584
585
586
587
















588
589
590
591
592
593
594
595
596
597

598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
AR=ar
RANLIB=ranlib
CC="gcc -DTCL_UTF_MAX=6"
CXX="g++ -fno-exceptions -fno-rtti -DTCL_UTF_MAX=6"
NM=nm
export STRIP AR RANLIB CC CXX RC NM

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 v4l2"
SUBDIRS="${SUBDIRS} tkhtml dbus-tcl dbus-intf tclx libdmtx ZBar zint"
SUBDIRS="${SUBDIRS} tcl-augeas snack tkvnc tksvg VecTcl tclral"
SUBDIRS="${SUBDIRS} tclepeg tcluvc xotcl nsf libsocketcan tclcan vu"
SUBDIRS="${SUBDIRS} rl_json mpexpr"
SUBDIRS="${SUBDIRS} tclcsv tkzinc libffi ffidl tcl-lmdb DiffUtilTcl"
................................................................................
        ;;
      mpexpr)
        rm -f ${i}/unix/build-stamp
        ;;
      snap7)
        rm -f ${i}/build/unix/build-stamp
        ;;



      *)
        rm -f ${i}/build-stamp
        ;;
     esac
  done
}

................................................................................
        ) || true
        ;;
      snap7)
        (
          exec >> build.log 2>&1
          make -C snap7/build/unix -f unix.mk clean || true
        ) || true






        ;;
      *)
        (
          exec >> build.log 2>&1
          make -C $i ${ACTION} || true
        ) || true
        ;;
................................................................................
  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
  # Enabled video drivers: wayland, X11, KMSDRM

  ./configure --prefix=${PFX_HERE} \
    --disable-shared --disable-arts --disable-esd --disable-nas \
    --enable-pulseaudio-shared --enable-alsa --disable-rpath \
    --enable-video-wayland --disable-video-wayland-qt-touch \
    --enable-video-opengles --enable-video-opengles2 \
    --enable-video-opengles1 --enable-wayland-shared \
    --enable-video-kmsdrm --disable-video-vulkan --disable-video-mir \
    --enable-video-jsmpeg --disable-fcitx || exit 1
  make || exit 1
  make install || exit 1
  touch build-stamp
  echo >&3 "done"
) || fail

echo -n "build Tk (SDL2 backend, static) ... "







|
>







 







>
>
>







 







>
>
>
>
>
>







 







>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>










>
|
|
|
|
|
|
|
|







75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
...
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
...
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
...
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
AR=ar
RANLIB=ranlib
CC="gcc -DTCL_UTF_MAX=6"
CXX="g++ -fno-exceptions -fno-rtti -DTCL_UTF_MAX=6"
NM=nm
export STRIP AR RANLIB CC CXX RC NM

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 v4l2"
SUBDIRS="${SUBDIRS} tkhtml dbus-tcl dbus-intf tclx libdmtx ZBar zint"
SUBDIRS="${SUBDIRS} tcl-augeas snack tkvnc tksvg VecTcl tclral"
SUBDIRS="${SUBDIRS} tclepeg tcluvc xotcl nsf libsocketcan tclcan vu"
SUBDIRS="${SUBDIRS} rl_json mpexpr"
SUBDIRS="${SUBDIRS} tclcsv tkzinc libffi ffidl tcl-lmdb DiffUtilTcl"
................................................................................
        ;;
      mpexpr)
        rm -f ${i}/unix/build-stamp
        ;;
      snap7)
        rm -f ${i}/build/unix/build-stamp
        ;;
      libwebsockets)
        rm -f ${i}/build/build-stamp
	;;
      *)
        rm -f ${i}/build-stamp
        ;;
     esac
  done
}

................................................................................
        ) || true
        ;;
      snap7)
        (
          exec >> build.log 2>&1
          make -C snap7/build/unix -f unix.mk clean || true
        ) || true
        ;;
      libwebsockets)
        (
          exec >> build.log 2>&1
          rm -rf libwebsockets/build
        ) || true
        ;;
      *)
        (
          exec >> build.log 2>&1
          make -C $i ${ACTION} || true
        ) || true
        ;;
................................................................................
  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
  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
  # Enabled video drivers: wayland, X11, KMSDRM
  PKG_CONFIG_PATH="${PFX_HERE}/extra/lib/pkgconfig" \
    ./configure --prefix=${PFX_HERE} \
      --disable-shared --disable-arts --disable-esd --disable-nas \
      --enable-pulseaudio-shared --enable-alsa --disable-rpath \
      --enable-video-wayland --disable-video-wayland-qt-touch \
      --enable-video-opengles --enable-video-opengles2 \
      --enable-video-opengles1 --enable-wayland-shared \
      --enable-video-kmsdrm --disable-video-vulkan --disable-video-mir \
      --enable-video-jsmpeg --disable-fcitx || exit 1
  make || exit 1
  make install || exit 1
  touch build-stamp
  echo >&3 "done"
) || fail

echo -n "build Tk (SDL2 backend, static) ... "