Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

.github/workflows/config.yml: #509

Merged
merged 4 commits into from
Apr 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions .github/workflows/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,38 @@ jobs:
echo "Testing branch $TRAVIS_BRANCH of $REPOSITORY_NAME on $QEMU_VOLUME"
docker run --rm $QEMU_VOLUME -v $HOME:$HOME -e "QEMU=$QEMU" -e "TRAVIS_OS_NAME=$TRAVIS_OS_NAME" -e "CI_SOURCE_PATH=$CI_SOURCE_PATH" -e "HOME=$HOME" -e "MAKEFLAGS=$MAKEFLAGS" -e "DOCKER_IMAGE=$DOCKER_IMAGE" -t $DOCKER_IMAGE sh -c "cd $CI_SOURCE_PATH; ./.travis.sh"

debian-unstable:
strategy:
matrix:
include:
- DOCKER_IMAGE: amd64/debian:unstable-slim
ARCH: Linux64
- DOCKER_IMAGE: arm32v7/debian:unstable-slim
ARCH: LinuxARM
- DOCKER_IMAGE: arm64v8/debian:unstable-slim
ARCH: LinuxARM

runs-on: ubuntu-latest
timeout-minutes: 60

name: debian-unstale
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Run test
shell: bash
run: |
export DOCKER_IMAGE=${{matrix.DOCKER_IMAGE}}
export ARCH=${{matrix.ARCH}}
set -x
sudo apt update -qq
# Install the qemu packages
# This step will execute the registering scripts
if [[ "$DOCKER_IMAGE" == *"arm"* ]]; then \
sudo apt install -y -qq qemu binfmt-support qemu-user-static; \
docker run --rm --privileged multiarch/qemu-user-static --reset -p yes; \
fi
docker run --rm -v $(pwd):/ws/euslisp -e "ARCH=$ARCH" -t "$DOCKER_IMAGE" bash -c "set -x; set -e; apt update -qq; apt install -y -qq make gcc libgl-dev libglu1-mesa-dev libjpeg-dev libpng-dev libpq-dev libx11-dev libxext-dev; ARCH=$ARCH EUSDIR=/ws/euslisp make -C /ws/euslisp/lisp/ -f Makefile.$ARCH eus0; CC='gcc -Werror' ARCHDIR=$ARCH EUSDIR=/ws/euslisp make -C /ws/euslisp/lisp/image/jpeg; exit 0"

osx:
runs-on: macos-latest
Expand Down
4 changes: 2 additions & 2 deletions .travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,8 @@ if [[ "$QEMU" != "" ]]; then
git clone http://salsa.debian.org/science-team/euslisp /tmp/euslisp-dfsg
for file in $(cat /tmp/euslisp-dfsg/debian/patches/series); do
# skip patches already applied by https://github.com/euslisp/EusLisp/pull/482
[[ $file =~ use-rtld-global-loadelf.patch|fix-arm-ldflags.patch|fix-library-not-linked-against-libc.patch|fix-manpage-has-bad-whatis-entry-on-man-pages.patch ]] && continue;
# skip patch already applied by https://github.com/euslisp/EusLisp/pull/441
[[ $file =~ use-rtld-global-loadelf.patch|fix-arm-ldflags.patch|fix-library-not-linked-against-libc.patch|fix-manpage-has-bad-whatis-entry-on-man-pages.patch|fix-jpegmemcd-compile-error.patch ]] && continue;
# skip patch already applied by https://github.com/euslisp/EusLisp/pull/441, https://github.com/euslisp/EusLisp/pull/509
if [[ $file =~ fix-for-reprotest.patch ]]; then
filterdiff -p1 -x 'lisp/image/jpeg/makefile' -x 'lisp/comp/comp.l' < /tmp/euslisp-dfsg/debian/patches/$file > /tmp/euslisp-dfsg/debian/patches/$file-fix
file=$file-fix
Expand Down
4 changes: 4 additions & 0 deletions lisp/c/unixcall.c
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,12 @@ extern int errno;
#include <time.h>
//extern char *tzname[2];
#if !Cygwin /* extern timezone */
#if defined __USE_MISC || defined __USE_XOPEN
extern long int timezone;
#else
extern time_t timezone, altzone; /*long*/
#endif
#endif
extern int daylight;

extern pointer eussigvec[NSIG];
Expand Down
9 changes: 9 additions & 0 deletions lisp/image/jpeg/jpegmemcd.c
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,17 @@
#include <stdio.h>
#include "jpeglib.h"
#include <setjmp.h>

#if JPEG_LIB_VERSION >= 80 || defined(MEM_SRCDST_SUPPORTED)
#define jpeg_memio_dest(cinfo, outbuffer, outsize) \
jpeg_mem_dest((j_compress_ptr)cinfo, (unsigned char **)outbuffer, (unsigned long *)outsize)

#define jpeg_memio_src(cinfo, inbuffer, insize) \
jpeg_mem_src((j_decompress_ptr)cinfo, (const unsigned char *)inbuffer, (unsigned long)insize)
#else
GLOBAL(void) jpeg_memio_dest (j_compress_ptr cinfo, JOCTET *jpegimgbuf, long *size);
GLOBAL(void) jpeg_memio_src (j_decompress_ptr cinfo, JOCTET *buf, long size);
#endif


int JPEG_compress(JSAMPLE *image_buffer, long width, long height,
Expand Down
Loading