Merge pull request #13 from AmigaPorts/add-morphos-codesets

Add codesets SDK to MorphOS image

Dockerfile

@@ -1,7 +1,7 @@
 ARG BUILD_OS
 ARG BUILD_PFX
 
-FROM --platform=$TARGETPLATFORM amigadev/${BUILD_PFX}:latest as build-env
+FROM --platform=$TARGETPLATFORM amigadev/${BUILD_PFX}:latest AS build-env
 ARG TARGETPLATFORM
 
 FROM amigadev/docker-base:latest
@@ -10,8 +10,8 @@ ARG BUILD_OS
 ARG BUILD_PFX
 ARG PREFIX
 
-ENV CROSS_PFX $PREFIX
-ENV OS_NAME $BUILD_OS
+ENV CROSS_PFX=$PREFIX
+ENV OS_NAME=$BUILD_OS
 
 COPY --from=build-env /opt/${CROSS_PFX} /opt/${CROSS_PFX}
 
@@ -29,6 +29,7 @@ ENTRYPOINT ["/entry/entrypoint.sh"]
 COPY imagefiles/cmake.sh /usr/local/bin/cmake
 COPY imagefiles/ccmake.sh /usr/local/bin/ccmake
 COPY imagefiles/entrypoint.sh /entry/
+COPY imagefiles/patches/ /patches/
 
 ENV AS=${CROSS_ROOT}/bin/${CROSS_PFX}-as \
 	LD=${CROSS_ROOT}/bin/${CROSS_PFX}-ld \
@@ -47,7 +48,7 @@ RUN ln -sf ${CROSS_ROOT}/bin/${CROSS_PFX}-as /usr/bin/as && \
 COPY dependencies/toolchains/${CROSS_PFX}.cmake ${CROSS_ROOT}/lib/
 COPY dependencies/toolchains/Modules/${CROSS_PFX} /CMakeModules
 RUN cmake --version
-RUN mv -fv /CMakeModules/* /usr/share/cmake-`cmake --version|awk '{ print $3;exit }'|awk -F. '{print $1"."$2}'`/Modules/
+RUN cp -afv /CMakeModules/. /usr/share/cmake-`cmake --version|awk '{ print $3;exit }'|awk -F. '{print $1"."$2}'`/Modules/ && rm -rf /CMakeModules
 RUN ln -s /usr/share/cmake-`cmake --version|awk '{ print $3;exit }'|awk -F. '{print $1"."$2}'`/Modules/Platform/Generic.cmake /usr/share/cmake-`cmake --version|awk '{ print $3;exit }'|awk -F. '{print $1"."$2}'`/Modules/Platform/${OS_NAME}.cmake
 ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/lib/${CROSS_PFX}.cmake
 ENV CMAKE_PREFIX_PATH /opt/${CROSS_PFX}:/opt/${CROSS_PFX}/usr

imagefiles/patches/sdl-old-timerbase-device.patch

@@ -0,0 +1,30 @@
+diff --git a/src/timer/amigaos/SDL_systimer.c b/src/timer/amigaos/SDL_systimer.c
+--- a/src/timer/amigaos/SDL_systimer.c
++++ b/src/timer/amigaos/SDL_systimer.c
+@@ -71,7 +71,7 @@
+ extern struct ExecBase *SysBase;
+ 
+ static struct timeval basetime;
+-struct Library *TimerBase;
++struct Device *TimerBase;
+ 
+ struct Task *OwnerTask;
+ struct timerequest *TimerReq[2];         /* Local copy! */
+@@ -163,7 +163,7 @@ gettimerbase() {
+ 			/* Open with UNIT_VBLANK, but any unit can be used */
+ 			if ( !(error = OpenDevice(TIMERNAME, UNIT_MICROHZ, (struct IORequest *)TimerIO_2, 0L))) {
+ 				/* Issue the command and wait for it to finish, then get the reply */
+-				TimerBase = (struct Library *)TimerIO_2->tr_node.io_Device;
++				TimerBase = TimerIO_2->tr_node.io_Device;
+ 
+ 				TimerReq[0] = TimerIO_2;
+ 				TimerReq[1] = TimerIO_2;
+@@ -234,7 +234,7 @@ void SDL_Delay(Uint32 ms) {
+ /* Data to handle a single periodic alarm */
+ static int timer_alive = 0;
+ static SDL_Thread *timer_thread = NULL;
+-struct Library *TimerBase;
++struct Device *TimerBase;
+ 
+ int RunTimer(void *unused) {
+ 	struct timeval tv;

platforms/m68k-amigaos-gcc10/prep.sh

@@ -29,6 +29,9 @@ fi
 cd "${SUBMODULES}"/SDL
 git checkout SDL-1.2-AmigaOS3
 git pull
+if ! git apply --reverse --check /patches/sdl-old-timerbase-device.patch 2>/dev/null; then
+	git apply /patches/sdl-old-timerbase-device.patch
+fi
 rm -rf "${SUBMODULES}"/SDL/build
 mkdir -p "${SUBMODULES}"/SDL/build
 cd "${SUBMODULES}"/SDL/build

platforms/m68k-amigaos/prep.sh

@@ -29,6 +29,9 @@ fi
 cd "${SUBMODULES}"/SDL
 git checkout SDL-1.2-AmigaOS3
 git pull
+if ! git apply --reverse --check /patches/sdl-old-timerbase-device.patch 2>/dev/null; then
+	git apply /patches/sdl-old-timerbase-device.patch
+fi
 rm -rf "${SUBMODULES}"/SDL/build
 mkdir -p "${SUBMODULES}"/SDL/build
 cd "${SUBMODULES}"/SDL/build

platforms/ppc-amigaos/prep.sh

@@ -22,6 +22,37 @@ cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${SYSROOT} -DZLIB_BUI
 cmake --build . --config Release --target install -- -j$(getconf _NPROCESSORS_ONLN)
 cd "${SUBMODULES}"
 
+# AmiSSL SDK 5.27
+mkdir -p "${SUBMODULES}"/amissl
+cd "${SUBMODULES}"/amissl
+wget https://github.com/jens-maus/amissl/releases/download/5.27/AmiSSL-5.27-SDK.lha -O amissl.lha
+echo "5003bef8c5930354d16b0ce7196d71b2811891c42fad38a9238c5ce4098ad42a  amissl.lha" | sha256sum -c -
+lha -x amissl.lha
+# Use the SDK search paths so -mcrt selects the matching auto-init library.
+SDKROOT=/opt/${TARGET}/${TARGET}/SDK/local
+mkdir -p "${SDKROOT}"/common/include "${SDKROOT}"/common/lib "${SDKROOT}"/newlib/lib "${SDKROOT}"/clib2/lib
+cp -fvr AmiSSL/Developer/include/* "${SDKROOT}"/common/include/
+cp -fv AmiSSL/Developer/lib/AmigaOS4/libamisslstubs.a "${SDKROOT}"/common/lib/
+cp -fv AmiSSL/Developer/lib/AmigaOS4/newlib/libamisslauto.a "${SDKROOT}"/newlib/lib/
+cp -fv AmiSSL/Developer/lib/AmigaOS4/clib2/libamisslauto.a "${SDKROOT}"/clib2/lib/
+mkdir -p "${SYSROOT}"/share/doc/amissl
+cp -fv AmiSSL/Doc/AmiSSL.doc AmiSSL/Developer/README-SDK "${SYSROOT}"/share/doc/amissl/
+cp -fv /usr/share/common-licenses/Apache-2.0 "${SYSROOT}"/share/doc/amissl/LICENSE
+cd "${SUBMODULES}"
+rm -rf amissl
+
+# codesets SDK 6.22
+mkdir -p "${SUBMODULES}"/codesets
+cd "${SUBMODULES}"/codesets
+wget https://github.com/jens-maus/libcodesets/releases/download/6.22/codesets-6.22.lha -O codesets.lha
+echo "029d3bf9dd8b85bef6f0ccb58c0b4123d16cc5042a1c13519698016f6966750c  codesets.lha" | sha256sum -c -
+lha -x codesets.lha
+cp -fvr codesets/Developer/include/* "${SDKROOT}"/common/include/
+mkdir -p "${SYSROOT}"/share/doc/codesets
+cp -fv codesets/COPYING codesets/ReadMe "${SYSROOT}"/share/doc/codesets/
+cd "${SUBMODULES}"
+rm -rf codesets
+
 #MiniGL
 rm -rf MiniGL
 mkdir -p "${SUBMODULES}"/MiniGL

platforms/ppc-morphos/prep.sh

@@ -22,6 +22,18 @@ cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${SYSROOT} -DZLIB_BUI
 cmake --build . --config Release --target install -- -j$(getconf _NPROCESSORS_ONLN)
 cd "${SUBMODULES}"
 
+# codesets SDK 6.22
+mkdir -p "${SUBMODULES}"/codesets
+cd "${SUBMODULES}"/codesets
+wget https://github.com/jens-maus/libcodesets/releases/download/6.22/codesets-6.22.lha -O codesets.lha
+echo "029d3bf9dd8b85bef6f0ccb58c0b4123d16cc5042a1c13519698016f6966750c  codesets.lha" | sha256sum -c -
+lha -x codesets.lha
+mkdir -p "${SYSROOT}"/usr/include "${SYSROOT}"/usr/share/doc/codesets
+cp -fvr codesets/Developer/include/* "${SYSROOT}"/usr/include/
+cp -fv codesets/COPYING codesets/ReadMe "${SYSROOT}"/usr/share/doc/codesets/
+cd "${SUBMODULES}"
+rm -rf codesets
+
 # SDL1.2
 rm -rf powersdl_sdk*
 wget http://aminet.net/dev/misc/powersdl_sdk.lha -O powersdl_sdk.lha