From 723e3138d404c793d9270313ce76639d3ad21e83 Mon Sep 17 00:00:00 2001 From: alihanozturk Date: Tue, 14 Jun 2016 00:20:55 +0300 Subject: [PATCH 1/3] freerdp:update --- network/misc/freerdp/actions.py | 1 + network/misc/freerdp/pspec.xml | 49 ++++++++++++++++++++++++--------- 2 files changed, 37 insertions(+), 13 deletions(-) diff --git a/network/misc/freerdp/actions.py b/network/misc/freerdp/actions.py index b7d466d15a..9c75916cf5 100644 --- a/network/misc/freerdp/actions.py +++ b/network/misc/freerdp/actions.py @@ -9,6 +9,7 @@ from pisi.actionsapi import cmaketools def setup(): cmaketools.configure("-DCMAKE_SKIP_RPATH=ON \ + -DWITH_LIBSYSTEMD=OFF \ -DCMAKE_INSTALL_LIBDIR=lib") def build(): diff --git a/network/misc/freerdp/pspec.xml b/network/misc/freerdp/pspec.xml index e0ee28fd78..ad21bfa08c 100644 --- a/network/misc/freerdp/pspec.xml +++ b/network/misc/freerdp/pspec.xml @@ -12,16 +12,23 @@ app:console A Remote Desktop Implementation FreeRDP is a free implementation of the Remote Desktop Protocol (RDP), released under Apacle License. - http://pub.freerdp.com/releases/freerdp-1.0.2.tar.gz + https://github.com/FreeRDP/FreeRDP/archive/aa15327a3ac30710fbf23547ebcf6593e5e1701b/FreeRDP-aa15327a3ac30710fbf23547ebcf6593e5e1701b.tar.gz cups-devel ffmpeg-devel alsa-lib-devel libXinerama-devel xmlto + libX11-devel + libXi-devel libXcursor-devel - libxkbfile-devel + libxkbcommon-devel + libxkbfile-devel libXv-devel + libXrandr-devel + gstreamer-next-devel + gst-plugins-base-next-devel + glib2-devel openssl-devel zlib-devel cmake @@ -29,26 +36,29 @@ util-linux - ffmpeg2.0.patch - patch_numblock.patch + + freerdp - cups + glib2 + libXi + libXv + ffmpeg libX11 + libXext openssl - libXv - ffmpeg - libXext - alsa-lib - libXcursor - libxkbfile + alsa-lib + libXfixes + libXcursor + libXrender + libxkbfile libXinerama - openssl - zlib + gstreamer-next + gst-plugins-base-next /usr/bin @@ -58,14 +68,27 @@ /usr/share/man + freerdp-devel + + freerdp + openssl-devel + /usr/include + /usr/lib/pkgconfig + + 2016-06-14 + 2.0 + Version Bump + Pisi Linux Community + admin@pisilinux.org + 2016-06-09 1.0.2 From 7ca63616456d824e306b8fa0f99e11db7f0fae39 Mon Sep 17 00:00:00 2001 From: alihanozturk Date: Tue, 14 Jun 2016 00:40:03 +0300 Subject: [PATCH 2/3] xine-lib:add patch --- .../xine-lib/files/xine-lib-ffmpeg3.patch | 55 +++++++++++++++++++ multimedia/video/xine-lib/pspec.xml | 11 ++-- 2 files changed, 61 insertions(+), 5 deletions(-) create mode 100644 multimedia/video/xine-lib/files/xine-lib-ffmpeg3.patch diff --git a/multimedia/video/xine-lib/files/xine-lib-ffmpeg3.patch b/multimedia/video/xine-lib/files/xine-lib-ffmpeg3.patch new file mode 100644 index 0000000000..22354937a3 --- /dev/null +++ b/multimedia/video/xine-lib/files/xine-lib-ffmpeg3.patch @@ -0,0 +1,55 @@ +Index: xine-lib-1.2.6/src/combined/ffmpeg/ff_audio_decoder.c +=================================================================== +--- xine-lib-1.2.6.orig/src/combined/ffmpeg/ff_audio_decoder.c ++++ xine-lib-1.2.6/src/combined/ffmpeg/ff_audio_decoder.c +@@ -590,7 +590,7 @@ static int ff_audio_decode (ff_audio_dec + int got_frame; + float gain = this->class->gain; + if (!this->av_frame) +- this->av_frame = avcodec_alloc_frame (); ++ this->av_frame = av_frame_alloc (); + + consumed = avcodec_decode_audio4 (this->context, this->av_frame, &got_frame, &avpkt); + if ((consumed >= 0) && got_frame) { +@@ -1071,7 +1071,7 @@ static void ff_audio_reset (audio_decode + /* try to reset the wma decoder */ + if( this->decoder_ok ) { + #if AVAUDIO > 3 +- avcodec_free_frame (&this->av_frame); ++ av_frame_free (&this->av_frame); + #endif + pthread_mutex_lock (&ffmpeg_lock); + avcodec_close (this->context); +@@ -1105,7 +1105,7 @@ static void ff_audio_dispose (audio_deco + + if( this->context && this->decoder_ok ) { + #if AVAUDIO > 3 +- avcodec_free_frame (&this->av_frame); ++ av_frame_free (&this->av_frame); + #endif + pthread_mutex_lock (&ffmpeg_lock); + avcodec_close (this->context); +Index: xine-lib-1.2.6/src/combined/ffmpeg/ff_video_decoder.c +=================================================================== +--- xine-lib-1.2.6.orig/src/combined/ffmpeg/ff_video_decoder.c ++++ xine-lib-1.2.6/src/combined/ffmpeg/ff_video_decoder.c +@@ -2523,7 +2523,7 @@ static video_decoder_t *ff_video_open_pl + this->stream = stream; + this->class = (ff_video_class_t *) class_gen; + +- this->av_frame = avcodec_alloc_frame(); ++ this->av_frame = av_frame_alloc(); + this->context = avcodec_alloc_context(); + this->context->opaque = this; + #if AVPALETTE == 1 +--- xine-lib-1.2.6/src/dxr3/ffmpeg_encoder.c.orig 2016-02-17 07:54:31.950881580 +0000 ++++ xine-lib-1.2.6/src/dxr3/ffmpeg_encoder.c 2016-02-17 07:55:42.897237494 +0000 +@@ -161,7 +161,7 @@ + "dxr3_mpeg_encoder: Couldn't start the ffmpeg library\n"); + return 0; + } +- this->picture = avcodec_alloc_frame(); ++ this->picture = av_frame_alloc(); + if (!this->picture) { + xprintf(drv->class->xine, XINE_VERBOSITY_LOG, + "dxr3_mpeg_encoder: Couldn't allocate ffmpeg frame\n"); \ No newline at end of file diff --git a/multimedia/video/xine-lib/pspec.xml b/multimedia/video/xine-lib/pspec.xml index 89b7bd7d52..e4a126a7db 100644 --- a/multimedia/video/xine-lib/pspec.xml +++ b/multimedia/video/xine-lib/pspec.xml @@ -29,7 +29,7 @@ libvorbis-devel mesa-devel libdvdcss-devel - DirectFB-devel + DirectFB-devel flac-devel libsdl-devel alsa-lib-devel @@ -52,11 +52,12 @@ libSM-devel libICE-devel - libcdio-devel + libcdio-devel mesa-glu-devel libvdpau-devel + xine-lib-ffmpeg3.patch list.patch multilib.patch no_autopoint.patch @@ -95,7 +96,7 @@ libxcb alsa-lib freetype - DirectFB + DirectFB libvdpau mesa-glu @@ -136,9 +137,9 @@ - 2016-06-09 + 2016-06-14 1.2.6 - Release Bump + Release Bump. Pisi Linux Community admin@pisilinux.org From 2a4146ecb7489e0e252e790aa3355495e1e3e44c Mon Sep 17 00:00:00 2001 From: alihanozturk Date: Tue, 14 Jun 2016 00:44:15 +0300 Subject: [PATCH 3/3] xine-lib:fix head --- multimedia/video/xine-lib/files/xine-lib-ffmpeg3.patch | 4 ---- multimedia/video/xine-lib/pspec.xml | 4 ---- 2 files changed, 8 deletions(-) diff --git a/multimedia/video/xine-lib/files/xine-lib-ffmpeg3.patch b/multimedia/video/xine-lib/files/xine-lib-ffmpeg3.patch index 1f6806906c..f0cbc47488 100644 --- a/multimedia/video/xine-lib/files/xine-lib-ffmpeg3.patch +++ b/multimedia/video/xine-lib/files/xine-lib-ffmpeg3.patch @@ -52,8 +52,4 @@ Index: xine-lib-1.2.6/src/combined/ffmpeg/ff_video_decoder.c + this->picture = av_frame_alloc(); if (!this->picture) { xprintf(drv->class->xine, XINE_VERBOSITY_LOG, -<<<<<<< HEAD "dxr3_mpeg_encoder: Couldn't allocate ffmpeg frame\n"); -======= - "dxr3_mpeg_encoder: Couldn't allocate ffmpeg frame\n"); ->>>>>>> a702ec9aec8c201fc9985eed2bed7e5b675a5129 diff --git a/multimedia/video/xine-lib/pspec.xml b/multimedia/video/xine-lib/pspec.xml index 93e4878ac9..88cb726bf2 100644 --- a/multimedia/video/xine-lib/pspec.xml +++ b/multimedia/video/xine-lib/pspec.xml @@ -138,11 +138,7 @@ -<<<<<<< HEAD 2016-06-14 -======= - 2016-06-13 ->>>>>>> a702ec9aec8c201fc9985eed2bed7e5b675a5129 1.2.6 Release Bump. Pisi Linux Community