Date: Friday, December 15, 2017 @ 15:12:33 Author: spupykin Revision: 274521
upgpkg: hedgewars 0.9.23-1 Modified: hedgewars/trunk/PKGBUILD Deleted: hedgewars/trunk/hedgewars-ffmpeg3.patch -------------------------+ PKGBUILD | 38 ++++++++++++----------- hedgewars-ffmpeg3.patch | 76 ---------------------------------------------- 2 files changed, 21 insertions(+), 93 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-12-15 15:12:19 UTC (rev 274520) +++ PKGBUILD 2017-12-15 15:12:33 UTC (rev 274521) @@ -3,42 +3,46 @@ # Contributor: Tinxy <arch at tinx dot eu> pkgname=hedgewars -pkgver=0.9.22 -pkgrel=8 +pkgver=0.9.23 +pkgrel=1 pkgdesc="Turn-based strategy artillery game similiar to Worms" arch=('x86_64') url="https://hedgewars.org" license=('GPL' 'custom') -depends=('qt4' 'sdl' 'sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'lua51' 'ffmpeg' 'glut' 'physfs') +depends=('qt4' 'sdl2' 'sdl2_mixer' 'sdl2_image' 'sdl2_net' 'sdl2_ttf' + 'lua51' 'ffmpeg' 'glut' 'physfs' + 'haskell-entropy' + 'haskell-sha' + 'haskell-random' + 'haskell-regex-tdfa' + 'haskell-sandi' + 'haskell-hslogger' + 'haskell-utf8-string' + 'haskell-vector') makedepends=('fpc' 'cmake' # haskell specific 'ghc' 'haskell-network' 'haskell-bytestring-show' - 'haskell-utf8-string' - 'haskell-dataenc' - 'haskell-hslogger' - 'haskell-vector' - 'haskell-entropy' - 'haskell-sha' + 'haskell-mtl' + 'haskell-stm' + 'haskell-sandi' 'haskell-zlib' - 'haskell-random' + 'haskell-containers' + 'haskell-base-prelude' + 'haskell-deepseq' # for scaling the icon 'imagemagick') source=("https://www.hedgewars.org/download/releases/hedgewars-src-$pkgver.tar.bz2" - "hedgewars-ffmpeg3.patch" "https://pkgs.fedoraproject.org/cgit/rpms/hedgewars.git/plain/hedgewars-cmake-ghc8-mask.patch") -sha256sums=('b699c8971ff420c3edd6533527ae2e99040f1e79207c9140826945bcf0e62192' - '8c77091440f0e9c6ca365e160f56b2195a573dca206ee29d762ff6a35af84604' +sha256sums=('da2e4908042be56d1c0f3cb80a355bde7f0a49f675b050a03228cc3fb22aae89' '3d2b115371b2584c598a158ad04f202b919391dba8f9bfda93972f7f97efbb7a') prepare() { cd ${pkgname}-src-${pkgver} sed -i 's|instance NFData (Chan a)$|instance NFData (Chan a) where rnf x = seq x ()|' gameServer/CoreTypes.hs - - # Fix build with ffmpeg 3.0 (Debian) - patch -p1 -i ../hedgewars-ffmpeg3.patch - + sed -i 's|set(ghc_flags|set(ghc_flags -dynamic|' gameServer/CMakeLists.txt + sed -i 's|execute_process(COMMAND ${GHC_EXECUTABLE}|execute_process(COMMAND ${GHC_EXECUTABLE} -dynamic|' cmake_modules/CheckHaskellModuleExists.cmake # Fix GHC 8 patch -p1 -i ../hedgewars-cmake-ghc8-mask.patch } Deleted: hedgewars-ffmpeg3.patch =================================================================== --- hedgewars-ffmpeg3.patch 2017-12-15 15:12:19 UTC (rev 274520) +++ hedgewars-ffmpeg3.patch 2017-12-15 15:12:33 UTC (rev 274521) @@ -1,76 +0,0 @@ -Description: Replace deprecated FFmpeg API -Author: Andreas Cadhalpun <andreas.cadhal...@googlemail.com> -Last-Update: <2015-11-02> - ---- hedgewars-0.9.22-dfsg.orig/QTfrontend/util/LibavInteraction.cpp -+++ hedgewars-0.9.22-dfsg/QTfrontend/util/LibavInteraction.cpp -@@ -106,8 +106,8 @@ LibavInteraction::LibavInteraction() : Q - if (!pCodec->pix_fmts) - continue; - bool yuv420Supported = false; -- for (const PixelFormat* pfmt = pCodec->pix_fmts; *pfmt != -1; pfmt++) -- if (*pfmt == PIX_FMT_YUV420P) -+ for (const AVPixelFormat* pfmt = pCodec->pix_fmts; *pfmt != -1; pfmt++) -+ if (*pfmt == AV_PIX_FMT_YUV420P) - { - yuv420Supported = true; - break; ---- hedgewars-0.9.22-dfsg.orig/hedgewars/avwrapper/avwrapper.c -+++ hedgewars-0.9.22-dfsg/hedgewars/avwrapper/avwrapper.c -@@ -158,7 +158,7 @@ static void AddAudioStream() - else - g_NumSamples = g_pAudio->frame_size; - g_pSamples = (int16_t*)av_malloc(g_NumSamples*g_Channels*sizeof(int16_t)); -- g_pAFrame = avcodec_alloc_frame(); -+ g_pAFrame = av_frame_alloc(); - if (!g_pAFrame) - { - Log("Could not allocate frame\n"); -@@ -241,7 +241,7 @@ static int AddVideoStream() - g_pVideo->time_base.den = g_Framerate.num; - g_pVideo->time_base.num = g_Framerate.den; - //g_pVideo->gop_size = 12; /* emit one intra frame every twelve frames at most */ -- g_pVideo->pix_fmt = PIX_FMT_YUV420P; -+ g_pVideo->pix_fmt = AV_PIX_FMT_YUV420P; - - // set quality - if (g_VQuality > 100) -@@ -299,7 +299,7 @@ static int AddVideoStream() - #endif - return FatalError("Could not open video codec %s", g_pVCodec->long_name); - -- g_pVFrame = avcodec_alloc_frame(); -+ g_pVFrame = av_frame_alloc(); - if (!g_pVFrame) - return FatalError("Could not allocate frame"); - -@@ -317,10 +317,10 @@ static int WriteFrame(AVFrame* pFrame) - // write interleaved audio frame - if (g_pAStream) - { -- VideoTime = (double)g_pVStream->pts.val*g_pVStream->time_base.num/g_pVStream->time_base.den; -+ VideoTime = (double)av_stream_get_end_pts(g_pVStream)*g_pVStream->time_base.num/g_pVStream->time_base.den; - do - { -- AudioTime = (double)g_pAStream->pts.val*g_pAStream->time_base.num/g_pAStream->time_base.den; -+ AudioTime = (double)av_stream_get_end_pts(g_pAStream)*g_pAStream->time_base.num/g_pAStream->time_base.den; - ret = WriteAudioFrame(); - } - while (AudioTime < VideoTime && ret); -@@ -526,14 +526,14 @@ AVWRAP_DECL int AVWrapper_Close() - avcodec_close(g_pVideo); - av_free(g_pVideo); - av_free(g_pVStream); -- av_free(g_pVFrame); -+ av_frame_free(&g_pVFrame); - } - if (g_pAStream) - { - avcodec_close(g_pAudio); - av_free(g_pAudio); - av_free(g_pAStream); -- av_free(g_pAFrame); -+ av_frame_free(&g_pAFrame); - av_free(g_pSamples); - fclose(g_pSoundFile); - }