diff options
| author | Eric B. Pratt <eric.b.pratt@gmail.com> | 2020-06-22 17:37:26 +0100 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2020-06-28 08:16:46 +0700 |
| commit | 55c9dbad5e9729f31c1453c6116cc054ae9f1276 (patch) | |
| tree | 41d3d044ba63019b0b84f6e2a2577f2a95298d0f /system | |
| parent | 989e79e60c01d9559c3aa80d083015d7807259db (diff) | |
system/vice: Add optional ffmpeg dependency.
Signed-off-by: Dave Woodfall <dave@slackbuilds.org>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'system')
| -rw-r--r-- | system/vice/README | 20 | ||||
| -rw-r--r-- | system/vice/config/x64.desktop | 9 | ||||
| -rw-r--r-- | system/vice/slack-desc | 2 | ||||
| -rw-r--r-- | system/vice/vice.SlackBuild | 8 |
4 files changed, 21 insertions, 18 deletions
diff --git a/system/vice/README b/system/vice/README index d023ecb72cbda..695f7c927c8bd 100644 --- a/system/vice/README +++ b/system/vice/README @@ -1,8 +1,16 @@ -VICE is the one and only Versatile Commodore Emulator. It provides emulation -of the Commodore C64, C128, VIC20, PET, PLUS4 and CBM-II computers. +VICE is the one and only Versatile Commodore Emulator. It provides +emulation of the Commodore C64, C128, VIC20, PET, PLUS4 and CBM-II +computers. NOTE: To use the standard application menu instead of the in-emulator -PETSCII menu, GTK3 v3.22 is required. Slackware 14.2 ships with 3.18 and -there is no upgrade package for this. Slackware Current has 3.22. So to -use the normal application menus, you either need to use Slackware Current -or find a way to upgrade your Slackware 14.2's GTK3 to v3.22. +PETSCII menu, GTK3 v3.22 is required. Slackware 14.2 ships with 3.18 +and there is no upgrade package for this. Slackware Current has 3.22. +So to use the normal application menus, you either need to use Slackware +Current or find a way to upgrade your Slackware 14.2's GTK3 to v3.22. + +Optional Dependency + +To enable recording of videos, you need ffmpeg. Enable this by passing +to the script the parameter: + + FFMPEG=yes ./vice.SlackBuild diff --git a/system/vice/config/x64.desktop b/system/vice/config/x64.desktop deleted file mode 100644 index 41e848596332f..0000000000000 --- a/system/vice/config/x64.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=VICE C64 emulator -Comment=Commodore 64 emulator from the VICE team -StartupNotify=true -Exec=x64 -Icon=vice -Terminal=false -Type=Application -Categories=System diff --git a/system/vice/slack-desc b/system/vice/slack-desc index b7266deab013a..9148291f61611 100644 --- a/system/vice/slack-desc +++ b/system/vice/slack-desc @@ -6,7 +6,7 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -vice: vice (the Versatile Commodore Emulator) +vice: VICE - the Versatile Commodore Emulator vice: vice: VICE is a program that runs on a Unix, MS-DOS, Win32, OS/2, BeOS, vice: QNX 4.x, QNX 6.x, Amiga, Syllable or Mac OS X machine and executes diff --git a/system/vice/vice.SlackBuild b/system/vice/vice.SlackBuild index f745447368479..578b7d0626a73 100644 --- a/system/vice/vice.SlackBuild +++ b/system/vice/vice.SlackBuild @@ -25,7 +25,7 @@ # Initialize variables PRGNAM=vice VERSION=${VERSION:-3.4} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -58,6 +58,10 @@ else LIBDIRSUFFIX="" fi +# The "--enable-shared-ffmpeg" option creates conflicts with external ffmpeg libraries +# So we use an external ffmpeg from another package if requested. +if [ "${FFMPEG:-no}" = "yes" ]; then ffmpeg="--enable-external-ffmpeg"; else ffmpeg=""; fi + # Exit if errors encountered set -e @@ -95,7 +99,7 @@ CXXFLAGS="$SLKCFLAGS" \ --localstatedir=/var \ --mandir=/usr/man \ --infodir=/usr/info \ - --enable-shared-ffmpeg \ + $ffmpeg \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --with-x \ --enable-quicktime \ |