From 107fa29d8d11d68244f841b1684df033f4fddae3 Mon Sep 17 00:00:00 2001 From: TheBrokenRail Date: Wed, 11 Nov 2020 23:24:51 -0500 Subject: [PATCH] Allow Docker-CE --- debian/client/native/DEBIAN/control | 2 +- debian/client/virgl/DEBIAN/control | 2 +- debian/server/DEBIAN/control | 2 +- mods/CMakeLists.txt | 3 --- mods/src/time.c | 11 ----------- 5 files changed, 3 insertions(+), 17 deletions(-) delete mode 100644 mods/src/time.c diff --git a/debian/client/native/DEBIAN/control b/debian/client/native/DEBIAN/control index d5e877412..8e81eee6c 100644 --- a/debian/client/native/DEBIAN/control +++ b/debian/client/native/DEBIAN/control @@ -4,5 +4,5 @@ Maintainer: TheBrokenRail Description: Fun with Blocks Homepage: https://www.minecraft.net/en-us/edition/pi Architecture: all -Depends: docker.io, docker-compose, zenity, policykit-1, passwd, login, qemu-user-static, binfmt-support +Depends: docker.io|docker-ce, docker-compose, zenity, policykit-1, passwd, login, qemu-user-static, binfmt-support Conflicts: minecraft-pi-virgl diff --git a/debian/client/virgl/DEBIAN/control b/debian/client/virgl/DEBIAN/control index 7db2872b7..645cfe9de 100644 --- a/debian/client/virgl/DEBIAN/control +++ b/debian/client/virgl/DEBIAN/control @@ -4,5 +4,5 @@ Maintainer: TheBrokenRail Description: Fun with Blocks Homepage: https://www.minecraft.net/en-us/edition/pi Architecture: all -Depends: docker.io, docker-compose, virgl-server, zenity, policykit-1, passwd, login, qemu-user-static, binfmt-support +Depends: docker.io|docker-ce, docker-compose, virgl-server, zenity, policykit-1, passwd, login, qemu-user-static, binfmt-support Conflicts: minecraft-pi-native diff --git a/debian/server/DEBIAN/control b/debian/server/DEBIAN/control index 358204b14..e81b0aeed 100644 --- a/debian/server/DEBIAN/control +++ b/debian/server/DEBIAN/control @@ -4,4 +4,4 @@ Maintainer: TheBrokenRail Description: Fun with Blocks Homepage: https://www.minecraft.net/en-us/edition/pi Architecture: all -Depends: docker.io, docker-compose, qemu-user-static, binfmt-support +Depends: docker.io|docker-ce, docker-compose, qemu-user-static, binfmt-support diff --git a/mods/CMakeLists.txt b/mods/CMakeLists.txt index e81033c8f..ec265a883 100644 --- a/mods/CMakeLists.txt +++ b/mods/CMakeLists.txt @@ -27,6 +27,3 @@ target_link_libraries(compat core extra SDL GLESv1_CM GLESv2 X11 dl freeimage gl target_link_options(compat PRIVATE "-Wl,--no-as-needed") add_library(readdir SHARED src/readdir.c) - -add_library(time SHARED src/time.c) -target_link_libraries(time rt) diff --git a/mods/src/time.c b/mods/src/time.c deleted file mode 100644 index 4f0fdd2bb..000000000 --- a/mods/src/time.c +++ /dev/null @@ -1,11 +0,0 @@ -#include -#include - -// Replace gettimeofday() With clock_gettime() -int gettimeofday(struct timeval *tv, __attribute__((unused)) void *tz) { - struct timespec tp; - int ret = clock_gettime(CLOCK_MONOTONIC_COARSE, &tp); - tv->tv_sec = tp.tv_sec; - tv->tv_usec = tp.tv_nsec * 0.001; - return ret; -} \ No newline at end of file