Hi,
the patch for d/control is actually not good as buildd will ignore the 
alternatives.
This should be better :

- liblua5.1-0-dev,
- libluajit-5.1-dev,
+ libluajit-5.1-dev [!s390x !alpha !hppa !ia64 !m68k !powerpcspe !sh4 !sparc64] 
| liblua5.1-0-dev

based on the current support of luajit.

F.

On Mon, 12 Mar 2018 19:26:53 +0100, Frédéric Bonnard <fre...@debian.org> wrote:
> Package: src:aegisub
> Version: 3.2.2+dfsg-3
> 
> --
> 
> Dear maintainer,
> 
> at the moment both liblua5.1-0-dev and libluajit-5.1-dev are required to
> build. I think one or the other exclusively should be enough.
> The best being to require first libluajit-5.1-dev if available and
> fallback on liblua5.1-0-dev.
> This way, aegisub will benefit from luajit's speed if possible but will
> build on more architectures as well thanks to lua's portability.
> Here is a patch for this.
> Also, right now, liblua5.1-0-dev is never used as pkg-config will only
> point to luajit which should be fixed I guess even if you're not
> interested in the patch.
> Last but not least, ppc64el's support in luajit is unsure in the
> long term, so with the patch, we ensure to be able to still have aegisub
> on this architecture even if luajit drops ppc64el support.
> Thanks,
> 
> Regards.
> F.
> diff -Nru aegisub-3.2.2+dfsg/debian/control aegisub-3.2.2+dfsg/debian/control
> --- aegisub-3.2.2+dfsg/debian/control 2015-09-18 22:31:15.000000000 +0000
> +++ aegisub-3.2.2+dfsg/debian/control 2015-09-18 22:30:12.000000000 +0000
> @@ -22,8 +22,7 @@
>                 libglu1-mesa-dev | libglu-dev,
>                 libhunspell-dev,
>                 libicu-dev,
> -               liblua5.1-0-dev,
> -               libluajit-5.1-dev,
> +               libluajit-5.1-dev | liblua5.1-0-dev,
>                 libpulse-dev,
>                 libwxgtk3.0-dev,
>                 lua5.1
> diff -Nru 
> aegisub-3.2.2+dfsg/debian/patches/remove-vendor-luajit-dependency.patch 
> aegisub-3.2.2+dfsg/debian/patches/remove-vendor-luajit-dependency.patch
> --- aegisub-3.2.2+dfsg/debian/patches/remove-vendor-luajit-dependency.patch   
> 2015-09-18 22:31:15.000000000 +0000
> +++ aegisub-3.2.2+dfsg/debian/patches/remove-vendor-luajit-dependency.patch   
> 2015-09-18 22:30:12.000000000 +0000
> @@ -20,7 +20,7 @@
>   CFLAGS_LIBASS      = @LIBASS_CFLAGS@
>   CFLAGS_LIBPULSE    = @LIBPULSE_CFLAGS@
>  -CFLAGS_LUA         = -I$(TOP)vendor/luajit/include
> -+CFLAGS_LUA         = `pkg-config --cflags luajit`
> ++CFLAGS_LUA         = `pkg-config --cflags luajit` `pkg-config --cflags 
> lua51`
>   CFLAGS_OPENAL      = @OPENAL_CFLAGS@
>   CFLAGS_OSS         = @OSS_CFLAGS@
>   CFLAGS_PORTAUDIO   = @PORTAUDIO_CFLAGS@
> @@ -29,7 +29,7 @@
>   LIBS_LIBASS        = @LIBASS_LIBS@
>   LIBS_LIBPULSE      = @LIBPULSE_LIBS@
>  -LIBS_LUA           = $(TOP)vendor/luajit/src/libluajit.a
> -+LIBS_LUA           = `pkg-config --libs luajit`
> ++LIBS_LUA           = `pkg-config --libs luajit` `pkg-config --libs lua51`
>   LIBS_OPENAL        = @OPENAL_LIBS@
>   LIBS_PORTAUDIO     = @PORTAUDIO_LIBS@
>   LIBS_PTHREAD       = @PTHREAD_LIBS@
> @@ -43,10 +43,10 @@
>  -$(d)auto4_lua_assfile.o_FLAGS           := -I$(TOP)vendor/luajit/include
>  -$(d)auto4_lua_dialog.o_FLAGS            := -I$(TOP)vendor/luajit/include
>  -$(d)auto4_lua_progresssink.o_FLAGS      := -I$(TOP)vendor/luajit/include
> -+$(d)auto4_lua.o_FLAGS                   := `pkg-config --cflags luajit`
> -+$(d)auto4_lua_assfile.o_FLAGS           := `pkg-config --cflags luajit`
> -+$(d)auto4_lua_dialog.o_FLAGS            := `pkg-config --cflags luajit`
> -+$(d)auto4_lua_progresssink.o_FLAGS      := `pkg-config --cflags luajit`
> ++$(d)auto4_lua.o_FLAGS                   := `pkg-config --cflags luajit` 
> `pkg-config --cflags lua51`
> ++$(d)auto4_lua_assfile.o_FLAGS           := `pkg-config --cflags luajit` 
> `pkg-config --cflags lua51`
> ++$(d)auto4_lua_dialog.o_FLAGS            := `pkg-config --cflags luajit` 
> `pkg-config --cflags lua51`
> ++$(d)auto4_lua_progresssink.o_FLAGS      := `pkg-config --cflags luajit` 
> `pkg-config --cflags lua51`
>   
>   $(src_OBJ): $(d)libresrc/bitmap.h $(d)libresrc/default_config.h
>   

Attachment: pgptVu4tZFe5B.pgp
Description: PGP signature

Attachment: pgpAPIcMx959Z.pgp
Description: PGP signature

Reply via email to