diff options
| -rw-r--r-- | network/freerdp/freerdp.SlackBuild | 38 | ||||
| -rw-r--r-- | network/freerdp/freerdp.info | 10 | ||||
| -rw-r--r-- | network/freerdp/patch-ffmpeg-2.0.diff | 36 |
3 files changed, 20 insertions, 64 deletions
diff --git a/network/freerdp/freerdp.SlackBuild b/network/freerdp/freerdp.SlackBuild index 7a21c3eabd08f..fc852a9cb2fee 100644 --- a/network/freerdp/freerdp.SlackBuild +++ b/network/freerdp/freerdp.SlackBuild @@ -4,6 +4,7 @@ # free implementation of the Remote Desktop Protocol # Copyright 2010,2012 Niels Horn, Rio de Janeiro, RJ, Brazil +# Copyright 2015 Philip van der Hoeven, Almere, The Netherlands # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,16 +24,14 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# Revision date: 2012/02/17 - PRGNAM=freerdp -VERSION=${VERSION:-20131115_ea18d2b} +VERSION=${VERSION:-1.2.0_beta1_android9} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# This is a bit messy, but that's how upstream serves it... -#TARNAME=FreeRDP-$VERSION.tar.gz -#UNTARNAME=$(tar tf $TARNAME 2>/dev/null | head -n 1 | tr -d \/) +TARNAME=${VERSION%_*}+${VERSION##*_} +TARNAME=${TARNAME/_/-}.tar.gz +DIRNAME=FreeRDP-${VERSION//_/-} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -66,21 +65,15 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -#rm -rf $UNTARNAME -#tar xvf $CWD/$TARNAME -#cd $UNTARNAME -rm -fR $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* -cd $PRGNAM-$VERSION +rm -rf $DIRNAME +tar xvf $CWD/$TARNAME +cd $DIRNAME chown -R root:root . find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -# http://sourceforge.net/mailarchive/forum.php?thread_name=520BE6FD.5080803%40macports.org&forum_name=freerdp-devel -patch -p0 < $CWD/patch-ffmpeg-2.0.diff + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; mkdir -p build cd build @@ -88,12 +81,13 @@ cd build -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DWITH_CUPS=ON \ -DCMAKE_BUILD_TYPE=Release .. make VERBOSE=1 make install DESTDIR=$PKG cd .. -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true # Need to move man, cmake flag does not work @@ -103,9 +97,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - ChangeLog LICENSE README \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a ChangeLog LICENSE README $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/network/freerdp/freerdp.info b/network/freerdp/freerdp.info index e53fe76c54bd5..dad3a4b913bb8 100644 --- a/network/freerdp/freerdp.info +++ b/network/freerdp/freerdp.info @@ -1,10 +1,10 @@ PRGNAM="freerdp" -VERSION="20131115_ea18d2b" +VERSION="1.2.0_beta1_android9" HOMEPAGE="http://www.freerdp.com/" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/freerdp-20131115_ea18d2b.tar.xz" -MD5SUM="851cf17c44372e0bc07392489e33b47f" +DOWNLOAD="https://github.com/FreeRDP/FreeRDP/archive/1.2.0-beta1+android9.tar.gz" +MD5SUM="a4a0a4f6e69c871aeab0600091ca6118" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="ffmpeg" -MAINTAINER="Niels Horn" -EMAIL="niels.horn@gmail.com" +MAINTAINER="Philip van der Hoeven" +EMAIL="philip@vd-hoeven.nl" diff --git a/network/freerdp/patch-ffmpeg-2.0.diff b/network/freerdp/patch-ffmpeg-2.0.diff deleted file mode 100644 index db579217e576a..0000000000000 --- a/network/freerdp/patch-ffmpeg-2.0.diff +++ /dev/null @@ -1,36 +0,0 @@ ---- channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c.orig 2013-07-10 01:00:21.000000000 -0700 -+++ channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c 2013-08-12 22:26:28.000000000 -0700 -@@ -43,12 +43,20 @@ - #define AVMEDIA_TYPE_AUDIO 1 - #endif - -+#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE -+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio -+#endif -+ - typedef struct _TSMFFFmpegDecoder - { - ITSMFDecoder iface; - - int media_type; -+#if LIBAVCODEC_VERSION_MAJOR > 54 -+ enum AVCodecID codec_id; -+#else - enum CodecID codec_id; -+#endif - AVCodecContext* codec_context; - AVCodec* codec; - AVFrame* frame; -@@ -99,8 +107,12 @@ - mdecoder->codec_context->block_align = media_type->BlockAlign; - - #ifdef AV_CPU_FLAG_SSE2 -+#if LIBAVCODEC_VERSION_MAJOR < 55 - mdecoder->codec_context->dsp_mask = AV_CPU_FLAG_SSE2 | AV_CPU_FLAG_MMX2; - #else -+ av_set_cpu_flags_mask(AV_CPU_FLAG_SSE2 | AV_CPU_FLAG_MMX2); -+#endif -+#else - #if LIBAVCODEC_VERSION_MAJOR < 53 - mdecoder->codec_context->dsp_mask = FF_MM_SSE2 | FF_MM_MMXEXT; - #else |