From f43444546a303f8ab41e90527909d01e1cc056ce Mon Sep 17 00:00:00 2001 From: Humdinger Date: Tue, 14 Jan 2014 15:26:30 +0100 Subject: [PATCH 1/4] Improved recipe. Corrected some mistakes in recipe. Considered changes in makefile of newer QuickLaunch. --- .../quicklaunch/quicklaunch-0.9.6.recipe | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/haiku-apps/quicklaunch/quicklaunch-0.9.6.recipe b/haiku-apps/quicklaunch/quicklaunch-0.9.6.recipe index 7d54e77f1..b2b4a080e 100644 --- a/haiku-apps/quicklaunch/quicklaunch-0.9.6.recipe +++ b/haiku-apps/quicklaunch/quicklaunch-0.9.6.recipe @@ -7,42 +7,43 @@ them in a list. You choose an app from that list with the CursorUp/Down keys \ and launch it by hitting Return. Escape quits QuickLaunch. " HOMEPAGE="http://sourceforge.net/projects/quicklaunch-h/" -SRC_URI="git://git.code.sf.net/p/quicklaunch-h/code#c88a50516f3154b86efb4ae58ac8daaa3e45f675" +SRC_URI="git://git.code.sf.net/p/quicklaunch-h/code#0effdf6464be346374d1b9ea7f63f2af0a2cfbca" LICENSE="MIT" COPYRIGHT="2013 Humdinger" -REVISION="1" -ARCHITECTURES="x86_gcc2 ?x86" +REVISION="2" +ARCHITECTURES="x86_gcc2 x86" PROVIDES=" quicklaunch = $portVersion + app:quicklaunch = $portVersion " REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" - makefile_engine + haiku_devel >= $haikuVersion " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + makefile_engine cmd:gcc - cmd:ld cmd:make cmd:mkdepend - cmd:unzip - cmd:xres " +USER_SETTINGS_FILES="settings/QuickLaunch_settings" + BUILD() { - make OBJ_DIR=objects BUILDHOME=/boot/system/develop + make $jobArgs } INSTALL() { quicklaunchDir=$appsDir/QuickLaunch mkdir -p $quicklaunchDir - - cp -af objects/QuickLaunch $quicklaunchDir + + ARCH=$(echo $buildArchitecture | sed 's/_/-/g') + cp -af objects.$ARCH-release/QuickLaunch $quicklaunchDir cp -af ReadMe.html $quicklaunchDir cp -r images $quicklaunchDir From b6228f2dfd9332156348f6fecb29a715f82a13e2 Mon Sep 17 00:00:00 2001 From: Humdinger Date: Tue, 14 Jan 2014 15:29:19 +0100 Subject: [PATCH 2/4] Improved recipe. Corrected some mistakes in the recipe. Considered changes in makefile of new UberTuber version. --- haiku-apps/ubertuber/ubertuber-0.9.8.recipe | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/haiku-apps/ubertuber/ubertuber-0.9.8.recipe b/haiku-apps/ubertuber/ubertuber-0.9.8.recipe index d05c0e3fd..be0677f1b 100644 --- a/haiku-apps/ubertuber/ubertuber-0.9.8.recipe +++ b/haiku-apps/ubertuber/ubertuber-0.9.8.recipe @@ -9,13 +9,13 @@ websites and automatically inserts them into its URL text field. At this moment there is support for clips from: YouTube, Google video, MetaCafe, DailyMotion, Yahoo video, Photobucket, \ DepositFiles, Vimeo.com, blip.tv, Facebook video and Escapist magazine. -It may also work on videos from other sites... +For a complete list, check http://rg3.github.io/youtube-dl/supportedsites.html " HOMEPAGE="http://sourceforge.net/projects/ubertuber/" -SRC_URI="git://git.code.sf.net/p/ubertuber/code#9d33e8525806a581ed5229b213e81be9ecd29252" +SRC_URI="git://git.code.sf.net/p/ubertuber/code#12bc4486522dab6255f95c5a041674cd8b2cde2c" LICENSE="MIT" COPYRIGHT="2013 Humdinger" -REVISION="1" +REVISION="2" ARCHITECTURES="x86_gcc2 x86" PROVIDES=" @@ -28,27 +28,27 @@ REQUIRES=" " BUILD_REQUIRES=" haiku_devel >= $haikuVersion - makefile_engine " BUILD_PREREQUIRES=" + makefile_engine cmd:gcc cmd:make + cmd:mkdepend " USER_SETTINGS_FILES="settings/UberTuber_settings" BUILD() { - make $jobArgs BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` + make $jobArgs } INSTALL() { - ARCH=$(echo $buildArchitecture | sed 's/_/-/g') - ubertuberDir=$appsDir/UberTuber mkdir -p $ubertuberDir + ARCH=$(echo $buildArchitecture | sed 's/_/-/g') cp -af objects.$ARCH-release/UberTuber $ubertuberDir cp -af ReadMe.html $ubertuberDir cp -r images $ubertuberDir From 0150188039ea402621feb2c0b650256daafcfd70 Mon Sep 17 00:00:00 2001 From: Humdinger Date: Tue, 14 Jan 2014 15:31:36 +0100 Subject: [PATCH 3/4] New recipe for newest youtube-dl version. --- .../youtube_dl/youtube_dl-2014.01.08.recipe | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 net-misc/youtube_dl/youtube_dl-2014.01.08.recipe diff --git a/net-misc/youtube_dl/youtube_dl-2014.01.08.recipe b/net-misc/youtube_dl/youtube_dl-2014.01.08.recipe new file mode 100644 index 000000000..9cd910ac4 --- /dev/null +++ b/net-misc/youtube_dl/youtube_dl-2014.01.08.recipe @@ -0,0 +1,53 @@ +SUMMARY="A command-line program to download videos from various sites" +DESCRIPTION=" +The program is usually invoked as youtube-dl followed by options and the video \ +URL. Run 'youtube-dl --help' and get a summary of all options. +Some YouTube videos are served using Adobe's proprietary RTMP protocol, which \ +imposes DRM restrictions and encrypts the connection. youtube-dl is not able \ +to download these videos by itself. +" +HOMEPAGE="http://rg3.github.io/youtube-dl/index.html" +SRC_URI="https://yt-dl.org/downloads/2014.01.08/youtube-dl-2014.01.08.tar.gz" +CHECKSUM_MD5="bb3e523b7e4e59ac64ce9a48fda86de7" +REVISION="1" +LICENSE="Public Domain" +COPYRIGHT="2006-2014 Ricardo Garcia Gonzalez" + +ARCHITECTURES="any" + +PROVIDES=" + youtube_dl = $portVersion + cmd:youtube_dl = $portVersion + " +REQUIRES=" + haiku >= $haikuVersion + cmd:python + " +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + " +BUILD_PREREQUIRES=" + cmd:make + cmd:zip + " + +SOURCE_DIR="youtube-dl" + +BUILD() +{ + true +} + +INSTALL() +{ + zip -q youtube-dl youtube_dl/*.py youtube_dl/*/*.py + zip -q -j youtube-dl youtube_dl/__main__.py + echo '#!/bin/python' > youtube-dl + cat youtube-dl.zip >> youtube-dl + rm youtube-dl.zip + chmod a+x youtube-dl + + mkdir -p $binDir $manDir/man1 + cp -a youtube-dl $binDir + cp -a youtube-dl.1 $manDir/man1 +} From 60502e6bb09c60391ca532d9b100ddc2d6c424d9 Mon Sep 17 00:00:00 2001 From: Humdinger Date: Wed, 15 Jan 2014 19:11:09 +0100 Subject: [PATCH 4/4] Corrected recipe As PulkoMandy pointed out the "cmd:make" isn't needed in the BUILD_REQUIRES. Rearranged BUILD() and INSTALL(). --- net-misc/youtube_dl/youtube_dl-2014.01.08.recipe | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/net-misc/youtube_dl/youtube_dl-2014.01.08.recipe b/net-misc/youtube_dl/youtube_dl-2014.01.08.recipe index 9cd910ac4..d36f33b21 100644 --- a/net-misc/youtube_dl/youtube_dl-2014.01.08.recipe +++ b/net-misc/youtube_dl/youtube_dl-2014.01.08.recipe @@ -27,7 +27,6 @@ BUILD_REQUIRES=" haiku_devel >= $haikuVersion " BUILD_PREREQUIRES=" - cmd:make cmd:zip " @@ -35,18 +34,16 @@ SOURCE_DIR="youtube-dl" BUILD() { - true -} - -INSTALL() -{ zip -q youtube-dl youtube_dl/*.py youtube_dl/*/*.py zip -q -j youtube-dl youtube_dl/__main__.py echo '#!/bin/python' > youtube-dl cat youtube-dl.zip >> youtube-dl rm youtube-dl.zip chmod a+x youtube-dl - +} + +INSTALL() +{ mkdir -p $binDir $manDir/man1 cp -a youtube-dl $binDir cp -a youtube-dl.1 $manDir/man1