Check-in [f6e2cf948a]
Not logged in

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: f6e2cf948ac813a916fe6627ebfa038ca06a8bff
User & Date: chw 2019-02-03 14:53:31
Context
2019-02-03
19:41
merge with trunk check-in: 4e1dcf7780 user: chw tags: wtf-8-experiment
14:53
merge with trunk check-in: f6e2cf948a user: chw tags: wtf-8-experiment
14:51
fix NULL pointer problem, disable mir video driver in linux build scripts check-in: 3a10ce4f25 user: chw tags: trunk
12:41
merge with trunk check-in: 8b8c35ffd9 user: chw tags: wtf-8-experiment
Changes

Changes to jni/SDL2/src/core/linux/SDL_evdev.c.

913
914
915
916
917
918
919




920
921
922
923
924
925
926

#ifdef SDL_EVDEV_TOUCHCALIBRATION
int
SDL_EVDEV_TouchCalibration(int op, int *calib)
{
#ifdef SDL_INPUT_LINUXEV
    SDL_evdevlist_item *item;





    /* Support one (first) touchscreen only */
    for (item = _this->first; item != NULL; item = item->next) {
        if (item->is_touchscreen) {
            if (op > 0) {
                /* set */
                if (calib[0] == calib[1] || calib[2] == calib[3]) {







>
>
>
>







913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930

#ifdef SDL_EVDEV_TOUCHCALIBRATION
int
SDL_EVDEV_TouchCalibration(int op, int *calib)
{
#ifdef SDL_INPUT_LINUXEV
    SDL_evdevlist_item *item;

    if (_this == NULL) {
        return -1;
    }

    /* Support one (first) touchscreen only */
    for (item = _this->first; item != NULL; item = item->next) {
        if (item->is_touchscreen) {
            if (op > 0) {
                /* set */
                if (calib[0] == calib[1] || calib[2] == calib[3]) {

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

612
613
614
615
616
617
618
619

620
621
622
623
624
625
626
627
628
629
630
631
....
1724
1725
1726
1727
1728
1729
1730
1731
1732
1733
1734
1735
1736
1737
1738
    CC="$CC -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads"
    CC="$CC -I/opt/vc/include/interface/vmcs_host/linux"
    CXX="$CXX -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads"
    CXX="$CXX -I/opt/vc/include/interface/vmcs_host/linux"
    LDFLAGS="-L/opt/vc/lib" ./configure --prefix=${PFX_HERE} \
      --disable-shared --disable-arts --disable-esd --disable-nas \
      --disable-pulseaudio --enable-alsa --disable-rpath \
      --disable-video-opengl --disable-video-vulkan --disable-fcitx || exit 1

  else
    ./configure --prefix=${PFX_HERE} \
      --disable-shared --disable-arts --disable-esd --disable-nas \
      --enable-pulseaudio-shared --enable-alsa --disable-rpath \
      --disable-video-vulkan --disable-fcitx || exit 1
  fi
  make || exit 1
  make install || exit 1
  touch build-stamp
  echo >&3 "done"
) || fail

................................................................................
  cp -rp ${PFX_HERE}/lib/parse_args* assets
  if test -d ${PFX_HERE}/lib/tkvlc* ; then
    cp -rp ${PFX_HERE}/lib/tkvlc* assets
  fi
  if test "$(uname -o)" = "GNU/Linux" ; then
    cp -rp ${AWDIR}/undroid/mkappimg assets
    cp -rp ${AWDIR}/assets/touchcal* assets
  fi 
  # add shortcuts providing builtin:widget, builtin:tksqlite, etc.
  (
    cd assets
    echo > widget \
      'source [file dirname [info script]]/'$(echo sdl2tk*)'/demos/widget'
    echo > tksqlite \
      'source [file dirname [info script]]/'$(echo tksqlite*)'/tksqlite.tcl'







|
>




|







 







|







612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
....
1725
1726
1727
1728
1729
1730
1731
1732
1733
1734
1735
1736
1737
1738
1739
    CC="$CC -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads"
    CC="$CC -I/opt/vc/include/interface/vmcs_host/linux"
    CXX="$CXX -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads"
    CXX="$CXX -I/opt/vc/include/interface/vmcs_host/linux"
    LDFLAGS="-L/opt/vc/lib" ./configure --prefix=${PFX_HERE} \
      --disable-shared --disable-arts --disable-esd --disable-nas \
      --disable-pulseaudio --enable-alsa --disable-rpath \
      --disable-video-opengl --disable-video-vulkan --disable-video-mir \
      --disable-fcitx || exit 1
  else
    ./configure --prefix=${PFX_HERE} \
      --disable-shared --disable-arts --disable-esd --disable-nas \
      --enable-pulseaudio-shared --enable-alsa --disable-rpath \
      --disable-video-vulkan --disable-video-mir --disable-fcitx || exit 1
  fi
  make || exit 1
  make install || exit 1
  touch build-stamp
  echo >&3 "done"
) || fail

................................................................................
  cp -rp ${PFX_HERE}/lib/parse_args* assets
  if test -d ${PFX_HERE}/lib/tkvlc* ; then
    cp -rp ${PFX_HERE}/lib/tkvlc* assets
  fi
  if test "$(uname -o)" = "GNU/Linux" ; then
    cp -rp ${AWDIR}/undroid/mkappimg assets
    cp -rp ${AWDIR}/assets/touchcal* assets
  fi
  # add shortcuts providing builtin:widget, builtin:tksqlite, etc.
  (
    cd assets
    echo > widget \
      'source [file dirname [info script]]/'$(echo sdl2tk*)'/demos/widget'
    echo > tksqlite \
      'source [file dirname [info script]]/'$(echo tksqlite*)'/tksqlite.tcl'

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

597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
  # 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-fcitx || exit 1
  make || exit 1
  make install || exit 1
  touch build-stamp
  echo >&3 "done"
) || fail

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







|







597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
  # 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 --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-linux32.sh.

599
600
601
602
603
604
605
606

607
608
609
610
611

612
613
614
615
616
617
618
  cd SDL2
  test -e build-stamp && echo >&3 "already done" && exit 0
  # CentOS 5 lacks libudev so need to cheat here
  if ! test -r /usr/include/libudev.h ; then
    CFLAGS="-I${SCRIPTDIR}/compat" ./configure --prefix=${PFX_HERE} \
      --build=i586-linux-gnu --disable-shared --disable-arts --disable-esd \
      --disable-nas --enable-pulseaudio-shared --enable-alsa --disable-rpath \
      --disable-video-opengles --disable-video-vulkan --disable-fcitx || exit 1

  else
    ./configure --prefix=${PFX_HERE} --build=i586-linux-gnu \
      --disable-shared --disable-arts --disable-esd --disable-nas \
      --enable-pulseaudio-shared --enable-alsa --disable-rpath \
      --disable-video-opengles --disable-video-vulkan --disable-fcitx || exit 1

  fi
  make || exit 1
  make install || exit 1
  touch build-stamp
  echo >&3 "done"
) || fail








|
>




|
>







599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
  cd SDL2
  test -e build-stamp && echo >&3 "already done" && exit 0
  # CentOS 5 lacks libudev so need to cheat here
  if ! test -r /usr/include/libudev.h ; then
    CFLAGS="-I${SCRIPTDIR}/compat" ./configure --prefix=${PFX_HERE} \
      --build=i586-linux-gnu --disable-shared --disable-arts --disable-esd \
      --disable-nas --enable-pulseaudio-shared --enable-alsa --disable-rpath \
      --disable-video-opengles --disable-video-vulkan --disable-video-mir \
      --disable-fcitx || exit 1
  else
    ./configure --prefix=${PFX_HERE} --build=i586-linux-gnu \
      --disable-shared --disable-arts --disable-esd --disable-nas \
      --enable-pulseaudio-shared --enable-alsa --disable-rpath \
      --disable-video-opengles --disable-video-vulkan --disable-video-mir \
      --disable-fcitx || exit 1
  fi
  make || exit 1
  make install || exit 1
  touch build-stamp
  echo >&3 "done"
) || fail

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

598
599
600
601
602
603
604
605

606
607
608
609
610

611
612
613
614
615
616
617
  cd SDL2
  test -e build-stamp && echo >&3 "already done" && exit 0
  # CentOS 5 lacks libudev so need to cheat here
  if ! test -r /usr/include/libudev.h ; then
    CFLAGS="-I${SCRIPTDIR}/compat" ./configure --prefix=${PFX_HERE} \
      --build=x86_64-linux-gnu --disable-shared --disable-arts --disable-esd \
      --disable-nas --enable-pulseaudio-shared --enable-alsa --disable-rpath \
      --disable-video-opengles --disable-video-vulkan --disable-fcitx || exit 1

  else
    ./configure --prefix=${PFX_HERE} --build=x86_64-linux-gnu \
      --disable-shared --disable-arts --disable-esd --disable-nas \
      --enable-pulseaudio-shared --enable-alsa --disable-rpath \
      --disable-video-opengles --disable-video-vulkan --disable-fcitx || exit 1

  fi
  make || exit 1
  make install || exit 1
  touch build-stamp
  echo >&3 "done"
) || fail








|
>




|
>







598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
  cd SDL2
  test -e build-stamp && echo >&3 "already done" && exit 0
  # CentOS 5 lacks libudev so need to cheat here
  if ! test -r /usr/include/libudev.h ; then
    CFLAGS="-I${SCRIPTDIR}/compat" ./configure --prefix=${PFX_HERE} \
      --build=x86_64-linux-gnu --disable-shared --disable-arts --disable-esd \
      --disable-nas --enable-pulseaudio-shared --enable-alsa --disable-rpath \
      --disable-video-opengles --disable-video-vulkan --disable-video-mir \
      --disable-fcitx || exit 1
  else
    ./configure --prefix=${PFX_HERE} --build=x86_64-linux-gnu \
      --disable-shared --disable-arts --disable-esd --disable-nas \
      --enable-pulseaudio-shared --enable-alsa --disable-rpath \
      --disable-video-opengles --disable-video-vulkan --disable-video-mir \
      --disable-fcitx || exit 1
  fi
  make || exit 1
  make install || exit 1
  touch build-stamp
  echo >&3 "done"
) || fail

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

597
598
599
600
601
602
603
604

605
606
607
608
609
610
611
  # 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-fcitx || exit 1

  make || exit 1
  make install || exit 1
  touch build-stamp
  echo >&3 "done"
) || fail

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







|
>







597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
  # 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 \
    --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) ... "