From c4617ba4b9b7a1a86f2e2097bb7cb2aa259e0042 Mon Sep 17 00:00:00 2001 From: Robert Kausch Date: Sat, 1 Dec 2018 22:10:35 +0100 Subject: [PATCH] fre:ac: bump to 1.1~alpha20181201 (#3430) --- .../freac/additional-files/freac.rdef.in | 69 ------------------- ....recipe => freac-1.1~alpha20181201.recipe} | 27 +------- .../patches/freac-1.1~alpha20180913.patchset | 29 -------- 3 files changed, 2 insertions(+), 123 deletions(-) delete mode 100644 media-sound/freac/additional-files/freac.rdef.in rename media-sound/freac/{freac-1.1~alpha20180913.recipe => freac-1.1~alpha20181201.recipe} (78%) delete mode 100644 media-sound/freac/patches/freac-1.1~alpha20180913.patchset diff --git a/media-sound/freac/additional-files/freac.rdef.in b/media-sound/freac/additional-files/freac.rdef.in deleted file mode 100644 index 5f173a567..000000000 --- a/media-sound/freac/additional-files/freac.rdef.in +++ /dev/null @@ -1,69 +0,0 @@ -resource app_signature "application/x-vnd.freac-freac"; - -resource app_flags B_MULTIPLE_LAUNCH; - -resource app_version { - major = @MAJOR@, - middle = @MIDDLE@, - minor = @MINOR@, - - variety = B_APPV_ALPHA, - internal = 0, - - short_info = "fre:ac - free audio converter", - long_info = "free audio converter to rip CDs and convert various file types." -}; - -resource large_icon array { - $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF" - $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF" - $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF" - $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF8E8DFF" - $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFAE8D8D8766668DB4" - $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFB48D8D8D86868686868693B4" - $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF128D8D8D8D8D8D8D8D8D8DB3B4" - $"FFFFFFFFFFFFFFFF101214141412FFFFFFFFFF8E8D9393939393939393B35FB5" - $"FFFFFFFFFFFF14181B1C1D1E1E1E1E1C16FFFF8E93B3B3B3B3B3B37EDCD5D5FF" - $"FFFFFFFF13611B1D1D1E1E1F1F1F1F1F1F1E168EB35FB3DCD4D5D5FFFFFFFFFF" - $"FFFFFF15611C1C1C1D1D1E1F1F1F1F1F1F1F1F87B3D508FFFFFFFFFFFFFFFFFF" - $"FFFF14611B1B1C1C1C1D1D1F1F1F1F1F1F1F1F87B310FFFFFFFFFFFFFFFFFFFF" - $"FF10611B1B1B1D1C1C1C1D1E1F1F1F1F1F1F1F87B31B10FFFFFFFFFFFFFFFFFF" - $"FF17611A191616181B1A1C1E1F1F1F1F1F1F1F87931D1BFFFFFFFFFFFFFFFFFF" - $"FF1A1B1616181818181A1A181C1C1E1F1F1F1F878D1D1F16FFFFFFFFFFFFFFFF" - $"1216181517171717181717151F1F1E1C1E1D1D678D1D1F1EFFFFFFFFFFFFFFFF" - $"14188716161213121587131715181C878786878D8D1E1F1F14FFFFFFFFFFFFFF" - $"1116871616181C1987151312AF0A87606066668D931D1F1F18FFFFFFFFFFFFFF" - $"11138787181A1C1A181614AFFFAD666666868C8D931A1E1E1BFFFFFFFFFFFFFF" - $"11181317611A1B1A1A181310FF938D8C6666666C8D181D1C1BFFFFFFFFFFFFFF" - $"FF1210151A1B1B1B1A160E1061878C666666606087611C1B1AFFFFFFFFFFFFFF" - $"FF161C1113181A1914AE611B1A1A611C1B401C87171B1B1B61FFFFFFFFFFFFFF" - $"FF0F1E111212AE0F130F1C18611C1B1B191614181A1A1A1A15FFFFFFFFFFFFFF" - $"FFFF161E1E1E12171F61181A1B611A1B18151A1A1A61611B0FFFFFFFFFFFFFFF" - $"FFFFFF1A1E1E1E1F1F1B171A141412181516616161196117FFFFFFFFFFFFFFFF" - $"FFFFFFFF1A1E1E1F1E138716181C18871310161818181AFFFFFFFFFFFFFFFFFF" - $"FFFFFFFFFF181F1F1F1A14148718161312131818191A0EFFFFFFFFFFFFFFFFFF" - $"FFFFFFFFFFFF121D1F171087141213870F10181A18AFFFFFFFFFFFFFFFFFFFFF" - $"FFFFFFFFFFFFFFFF121A1BAE121412AE161A1910FFFFFFFFFFFFFFFFFFFFFFFF" - $"FFFFFFFFFFFFFFFFFFFF0C0B100B0E0E0F0CFFFFFFFFFFFFFFFFFFFFFFFFFFFF" - $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF" - $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF" -}; - -resource mini_icon array { - $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF" - $"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF" - $"FFFFFFFFFFFFFFFFFFFFFFFFFF8E87AE" - $"FFFFFFFFFFFFFFFFFFFFAE8D8D868CB4" - $"FFFFFFFF12151411FFFF8D939393B3D4" - $"FFFF141B1D1F1F1F1D877EB4D5FFFFFF" - $"FF141B1C1C1E1F1F1F608EFFFFFFFFFF" - $"121918181A1B1E1F1F606013FFFFFFFF" - $"1517161616161A1B60871B1EFFFFFFFF" - $"1387181A1711AE86668D19FFFFFFFFFF" - $"1114191B191287666666181C10FFFFFF" - $"FF17151514191B1B19181A1AFFFFFFFF" - $"FFFF1E1C1C18181816191916FFFFFFFF" - $"FFFF101E1D141715121818FFFFFFFFFF" - $"FFFFFFFF141311111413FFFFFFFFFFFF" - $"FFFFFFFFFFFF0C0CFFFFFFFFFFFFFFFF" -}; diff --git a/media-sound/freac/freac-1.1~alpha20180913.recipe b/media-sound/freac/freac-1.1~alpha20181201.recipe similarity index 78% rename from media-sound/freac/freac-1.1~alpha20180913.recipe rename to media-sound/freac/freac-1.1~alpha20181201.recipe index cee49871e..e7e614540 100644 --- a/media-sound/freac/freac-1.1~alpha20180913.recipe +++ b/media-sound/freac/freac-1.1~alpha20181201.recipe @@ -19,10 +19,8 @@ COPYRIGHT="2001-2018 Robert Kausch" LICENSE="GNU GPL v2" REVISION="1" SOURCE_URI="https://github.com/enzo1982/freac/releases/download/v${portVersion/\~alpha/-alpha-}/freac-${portVersion/\~alpha/-alpha-}.tar.gz" -CHECKSUM_SHA256="5ca1f3b8f548815ced94e8df3b0b736d75879816939661ba1f1baa94fd36f168" +CHECKSUM_SHA256="f4baad80bd7f948196fc8e0a80a05c05bf8cb39758c7f9fc7465737a48cff750" SOURCE_DIR="freac-${portVersion/\~alpha/-alpha-}" -PATCHES="freac-$portVersion.patchset" -ADDITIONAL_FILES="freac.rdef.in" ARCHITECTURES="!x86_gcc2 x86 x86_64" if [ "$targetArchitecture" = x86_gcc2 ]; then @@ -54,6 +52,7 @@ REQUIRES=" lib:libfaac$secondaryArchSuffix lib:libfaad$secondaryArchSuffix lib:libFLAC$secondaryArchSuffix + lib:libMAC$secondaryArchSuffix lib:libmp3lame$secondaryArchSuffix lib:libmp4v2$secondaryArchSuffix lib:libmpg123$secondaryArchSuffix @@ -78,18 +77,6 @@ BUILD_PREREQUIRES=" cmd:pkg_config$secondaryArchSuffix " -PATCH() -{ - if [ -n "$secondaryArchSuffix" ]; then - sed -i \ - -e "s|/lib/freac|/$relativeLibDir/freac|" \ - src/loader/console.cpp - sed -i \ - -e "s|/lib/freac|/$relativeLibDir/freac|" \ - src/loader/gui.cpp - fi -} - BUILD() { make $jobArgs @@ -103,15 +90,5 @@ INSTALL() mkdir -p "$appsDir" mv "$commandBinDir"/freac "$appsDir" - local MAJOR="`echo "$portVersion" | cut -d. -f1`" - local MIDDLE="`echo "$portVersion" | cut -d. -f2 | cut -d~ -f1`" - local MINOR="0" - sed \ - -e "s|@MAJOR@|$MAJOR|" \ - -e "s|@MIDDLE@|$MIDDLE|" \ - -e "s|@MINOR@|$MINOR|" \ - "$portDir"/additional-files/freac.rdef.in > freac.rdef - - addResourcesToBinaries freac.rdef "$appsDir"/freac addAppDeskbarSymlink "$appsDir"/freac fre:ac } diff --git a/media-sound/freac/patches/freac-1.1~alpha20180913.patchset b/media-sound/freac/patches/freac-1.1~alpha20180913.patchset deleted file mode 100644 index f0363f2d7..000000000 --- a/media-sound/freac/patches/freac-1.1~alpha20180913.patchset +++ /dev/null @@ -1,29 +0,0 @@ -From d6d18041d5d98dcb85e104c4516324571338aa74 Mon Sep 17 00:00:00 2001 -From: Robert Kausch -Date: Sun, 7 Oct 2018 17:41:10 +0000 -Subject: Fix for Haiku packaging. - - -diff --git a/Makefile b/Makefile -index 2706bf5..d5ceb4f 100644 ---- a/Makefile -+++ b/Makefile -@@ -241,15 +241,9 @@ endif - - $(EXENAME): $(EXEOBJECTS) $(RESOBJECTS) - $(LD) $(EXEOBJECTS) $(RESOBJECTS) $(LDOPTS) $(LDOPTS_GUI) $(LDFLAGS) -o $@ --ifeq ($(BUILD_HAIKU),True) -- xres -o $(EXENAME) resources/binary/freac.rsrc --endif - - $(CMDNAME): $(CMDOBJECTS) $(RESOBJECTS) - $(LD) $(CMDOBJECTS) $(RESOBJECTS) $(LDOPTS) $(LDOPTS_CMD) $(LDFLAGS) -o $@ --ifeq ($(BUILD_HAIKU),True) -- xres -o $(CMDNAME) resources/binary/freac.rsrc --endif - - $(OBJECTS)/%.o: $(SRC)/%.cpp - $(CXX) $(CCOPTS) $(CXXFLAGS) $< -o $@ --- -2.19.0 -