Skip to content

Commit 82f67b1

Browse files
committed
Updates to version 3.0.0.1
1 parent 2303bc6 commit 82f67b1

File tree

13 files changed

+222
-204
lines changed

13 files changed

+222
-204
lines changed

CHANGELOG.md

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,28 @@
44

55
-------------------------------------------------------------------------------
66

7+
### 3.0.0.1
8+
9+
#### Added
10+
11+
- Added project website under docs
12+
13+
#### Changed
14+
15+
- Changed docs to haddock
16+
- Increased base optimization with fuzz and map
17+
- Increased default frame rate to 15
18+
- Set tighter bounds on number of colors
19+
- Set tighter bounds on quality percent clamp
20+
- Query stream for duration and then container for duration
21+
- Fixed empty file name issue
22+
23+
#### Removed
24+
25+
-
26+
27+
-------------------------------------------------------------------------------
28+
729
### 3.0.0.0
830

931
#### Added

Gifcurry.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: Gifcurry
2-
version: 3.0.0.0
2+
version: 3.0.0.1
33
synopsis: GIF creation utility.
44
description: Your open source video to GIF maker.
55
homepage: https://github.com/lettier/gifcurry

README.md

Lines changed: 20 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Is Gifcurry another Electron app? No way! Gifcurry is 100% #electronfree.
2828
No need to download more RAM, Gifcurry is light as a feather.
2929
Run it all day, run it all year—you'll never notice.
3030

31-
I know what your're thinkin', "Gifcurry is just FFMpeg and ImageMagick," but you'd be wrong.
31+
I know what you're thinkin', "Gifcurry is just FFMpeg and ImageMagick," but you'd be wrong.
3232
Gifcurry hides all the goofy details so you can concentrate on what matters—the almighty GIF.
3333
Making GIFs with Gifcurry is fun so try it out!
3434

@@ -39,6 +39,8 @@ Your template doesn't allow video in the hero image? Gifcurry.
3939
No GIF of your favorite movie scene? Gifcurry.
4040
Need a custom animated emoji for Slack? Gifcurry.
4141
Have an idea of the perfect GIF to close out that email? Gifcurry.
42+
Your README needs a GIF? Gifcurry.
43+
Video doesn't auto play on iOS? Gifcurry.
4244

4345
Gifcurry comes in handy for all sorts of scenarios.
4446

@@ -111,7 +113,7 @@ gifcurry_cli \
111113
`'╙╙╙╙'``
112114
113115
114-
Gifcurry 3.0.0.0
116+
Gifcurry 3.0.0.1
115117
(C) 2016 David Lettier
116118
lettier.com
117119
@@ -155,31 +157,31 @@ Bottom Crop: 25.000
155157

156158
## How do I get a copy of Gifcurry?
157159

158-
Gifcurry works on Linux, Mac, and probably Windows (left me know).
160+
Gifcurry works on Linux, Mac, and most likely Windows.
159161
Make sure you have FFmpeg, GStreamer, ImageMagick, and GTK+ installed on your machine.
160162
To find the latest version of Gifcurry, head over to the
161163
[releases page](https://github.com/lettier/gifcurry/releases).
162164

163165
### I use Linux.
164166

165167
If you use Linux then the easiest way to grab a copy of Gifcurry is by downloading the
166-
[AppImage](https://github.com/lettier/gifcurry/releases/download/3.0.0.0/gifcurry-3.0.0.0-x86_64.AppImage).
168+
[AppImage](https://github.com/lettier/gifcurry/releases/download/3.0.0.1/gifcurry-3.0.0.1-x86_64.AppImage).
167169
After you download the
168-
[AppImage](https://github.com/lettier/gifcurry/releases/download/3.0.0.0/gifcurry-3.0.0.0-x86_64.AppImage),
170+
[AppImage](https://github.com/lettier/gifcurry/releases/download/3.0.0.1/gifcurry-3.0.0.1-x86_64.AppImage),
169171
right click on it, select permissions, and check the box near execute.
170172
With that out of the way—you're all set—just double click on the AppImage
171173
and the GUI will fire right up.
172174

173175
You can also download and install the
174-
[AppImage](https://github.com/lettier/gifcurry/releases/download/3.0.0.0/gifcurry-3.0.0.0-x86_64.AppImage)
176+
[AppImage](https://github.com/lettier/gifcurry/releases/download/3.0.0.1/gifcurry-3.0.0.1-x86_64.AppImage)
175177
using the handy
176178
[AppImage install script](https://raw.githubusercontent.com/lettier/gifcurry/master/packaging/linux/app-image/gifcurry-app-image-install.sh)
177179
(right click and save link as).
178180
Download the script, right click on it, select permissions, check the box near execute, and double click on it.
179181
You should now see Gifcurry listed alongside your other installed programs.
180182

181183
If you want the CLI then download the
182-
[prebuilt version](https://github.com/lettier/gifcurry/releases/download/3.0.0.0/gifcurry-linux-3.0.0.0.tar.gz)
184+
[prebuilt version](https://github.com/lettier/gifcurry/releases/download/3.0.0.1/gifcurry-linux-3.0.0.1.tar.gz)
183185
for Linux, extract it, open up your terminal,
184186
`cd` to the bin folder, and then run `gifcurry_cli -?`.
185187
As an added bonus, inside the bin directory is the GUI version
@@ -191,17 +193,14 @@ If you'd rather install Gifcurry via pacman then copy the following into your te
191193

192194
```bash
193195
cd
194-
# Install git.
195196
sudo pacman -S git
196-
# Install Gifcurry.
197-
mkdir -p build_gifcurry
198-
cd build_gifcurry
197+
mkdir -p build-gifcurry
198+
cd build-gifcurry
199199
git clone https://aur.archlinux.org/gifcurry.git
200200
cd gifcurry
201201
makepkg -sic
202-
# Run Gifcurry CLI and GUI.
203202
cd
204-
rm -rf build_gifcurry
203+
rm -rf build-gifcurry
205204
gifcurry_cli -?
206205
gifcurry_gui
207206
```
@@ -228,94 +227,15 @@ The
228227
[Gifcurry snap](https://snapcraft.io/gifcurry)
229228
only comes with the GUI.
230229
If you want the CLI, download the
231-
[prebuilt version](https://github.com/lettier/gifcurry/releases/download/3.0.0.0/gifcurry-linux-3.0.0.0.tar.gz)
230+
[prebuilt version](https://github.com/lettier/gifcurry/releases/download/3.0.0.1/gifcurry-linux-3.0.0.1.tar.gz)
232231
for Linux.
233232

234233
### I use Mac.
235234

236-
If you use Mac then you'll need to find the terminal.
237-
Open Spotlight, type `Terminal`, and press enter.
238-
You should see a window open that has black text
239-
on a white background.
240-
241-
With the terminal open, copy the following into the terminal to install Homebrew.
242-
243-
```bash
244-
/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
245-
brew update
246-
```
247-
248-
After installing Homebrew, you'll need to install the right dependencies.
249-
250-
```bash
251-
xcode-select --install
252-
brew install \
253-
wget \
254-
git \
255-
libffi \
256-
libsvg \
257-
librsvg \
258-
libav \
259-
libogg \
260-
libvorbis \
261-
pkg-config \
262-
gobject-introspection \
263-
cairo \
264-
gdk-pixbuf \
265-
gsettings-desktop-schemas \
266-
gtk+3 \
267-
gtk-mac-integration \
268-
gnome-icon-theme \
269-
openh264 \
270-
theora \
271-
ffmpeg \
272-
imagemagick \
273-
ghostscript \
274-
gstreamer \
275-
gst-libav \
276-
gst-plugins-base \
277-
gst-plugins-good
278-
brew install --with-gtk+3 gst-plugins-bad
279-
wget -qO- https://get.haskellstack.org/ | sh -s - -f
280-
```
281-
282-
The next step is to download the Gifcurry source with a program called `git`.
283-
After downloading the source, change directory (`cd`) into the Gifcurry folder.
284-
285-
```bash
286-
git clone https://github.com/lettier/gifcurry.git
287-
cd gifcurry/
288-
```
289-
290-
Now that you have the source, copy this into the terminal.
291-
It's scary lookin' but it is telling the program that builds
292-
Gifcurry where the `libffi` package configuration is.
293-
294-
```bash
295-
LIBFFIPKGCONFIG=`find /usr/local/Cellar -path '*libffi*' -type d -name 'pkgconfig' 2>/dev/null | tr '\n' ':' | sed 's/:$//'`
296-
export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$LIBFFIPKGCONFIG
297-
```
298-
299-
We're almost there.
300-
With the `stack` program, install the Haskell specific dependencies and build Gifcurry.
301-
302-
```bash
303-
stack setup
304-
stack install alex happy
305-
stack install gtk2hs-buildtools
306-
stack install hsc2hs
307-
stack install
308-
```
309-
310-
`stack` places the two Gifcurry programs into a special folder.
311-
Copy the following into the terminal to create two shortcuts on your desktop.
312-
313-
```bash
314-
ln -s $HOME/.local/bin/gifcurry_cli $HOME/Desktop/gifcurry_cli
315-
ln -s $HOME/.local/bin/gifcurry_gui $HOME/Desktop/gifcurry_gui
316-
```
317-
318-
You can now click on `gifcurry_gui` from your desktop or run `gifcurry_cli` from the terminal.
235+
Mac users can download and run the
236+
[Mac install script](https://raw.githubusercontent.com/lettier/gifcurry/master/packaging/mac/gifcurry-mac-install-script.command)
237+
(hold down control, click the link, and select "Save Link As...").
238+
After running the install script, a shortcut to both the Gifcurry GUI and CLI will be on your desktop.
319239

320240
### I'm a Haskell developer.
321241

@@ -324,7 +244,7 @@ If you develop Haskell programs then the easiest way to build Gifcurry is with
324244
Copy the following into your terminal.
325245

326246
```bash
327-
git clone https://aur.archlinux.org/gifcurry.git
247+
git clone https://github.com/lettier/gifcurry.git
328248
cd gifcurry
329249
stack setup
330250
stack install alex happy
@@ -347,13 +267,13 @@ $HOME/.local/bin/gifcurry_gui
347267
### To build Gifcurry.
348268

349269
* [GObject Introspection](https://wiki.gnome.org/action/show/Projects/GObjectIntrospection)
350-
* [Haskell](https://docs.haskellstack.org/en/stable/README/)
270+
* [Haskell Stack](https://docs.haskellstack.org/en/stable/README/)
351271

352272
## What is the license?
353273

354274
For license information, see [LICENSE](LICENSE).
355275

356276
## Who wrote Gifcurry?
357277

358-
_(C) 2016 David Lettier_
278+
(C) 2016 David Lettier
359279
[lettier.com](http://www.lettier.com/)

docs/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,8 @@ <h2 class="">
146146
<a href="https://www.imagemagick.org/script/download.php">ImageMagick</a>.
147147
<p>
148148
Linux users can download the
149-
<a href="https://github.com/lettier/gifcurry/releases/download/3.0.0.0/gifcurry-3.0.0.0-x86_64.AppImage">AppImage</a> or
150-
the <a href="https://github.com/lettier/gifcurry/releases/download/3.0.0.0/gifcurry-linux-3.0.0.0.tar.gz">prebuilt binaries</a>.
149+
<a href="https://github.com/lettier/gifcurry/releases/download/3.0.0.1/gifcurry-3.0.0.1-x86_64.AppImage">AppImage</a> or
150+
the <a href="https://github.com/lettier/gifcurry/releases/download/3.0.0.1/gifcurry-linux-3.0.0.1.tar.gz">prebuilt binaries</a>.
151151
If you'd rather install it, you can do so via
152152
<a href="https://aur.archlinux.org/packages/gifcurry/">pacman</a> (Arch)
153153
or

makefile

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,20 @@ STACK_GHC_EXE=`$(STACK) path --compiler-exe`
99
STACK_GHC_BIN=`$(STACK) path --compiler-bin`
1010
STACK_PATHS=$(STACK_PATH_LOCAL_BIN):$(STACK_GHC_BIN)
1111
CABAL=env PATH=$(PATH):$(STACK_PATHS) $(STACK_PATH_LOCAL_BIN)/cabal
12-
VERSION='3.0.0.0'
12+
CABAL_SANDBOX_DIR=".cabal-sandbox"
13+
_APPLICATIONS_DESKTOP_DIR="$(CABAL_SANDBOX_DIR)/share/applications"
14+
_ICONS_HICOLOR_SCALABLE_APPS_DIR="$(CABAL_SANDBOX_DIR)/share/icons/hicolor/scalable/apps"
15+
_PACKAGING_LINUX_COMMON_DIR="./packaging/linux/common"
16+
VERSION='3.0.0.1'
1317

1418
export PATH := $(PATH):$(STACK_PATH_LOCAL_BIN)
1519

16-
all: setup update sandbox_clean clean alex happy haskell_gi gtk2hs_buildtools install_dependencies configure build install
20+
all: setup update sandbox_clean clean alex happy haskell_gi gtk2hs_buildtools install_dependencies configure build cabal_install
1721

1822
setup:
19-
$(STACK) setup && $(STACK) update && $(STACK) install Cabal && $(STACK) install cabal-install
23+
$(STACK) setup && $(STACK) update && \
24+
$(STACK) install Cabal && \
25+
$(STACK) install cabal-install
2026

2127
alex: setup
2228
$(STACK) install alex
@@ -51,41 +57,34 @@ install_dependencies: sandbox
5157
configure: sandbox
5258
$(CABAL) --require-sandbox configure -w $(STACK_GHC_EXE)
5359

60+
applications_desktop: sandbox
61+
mkdir -p $(_APPLICATIONS_DESKTOP_DIR) && \
62+
cp $(_PACKAGING_LINUX_COMMON_DIR)/gifcurry.desktop $(_APPLICATIONS_DESKTOP_DIR)/
63+
64+
icons_hicolor_scalable_apps: applications_desktop
65+
mkdir -p $(_ICONS_HICOLOR_SCALABLE_APPS_DIR) && \
66+
cp $(_PACKAGING_LINUX_COMMON_DIR)/gifcurry-icon.svg $(_ICONS_HICOLOR_SCALABLE_APPS_DIR)/
67+
5468
build: configure
5569
$(CABAL) --require-sandbox build -j
5670

57-
install: build
71+
cabal_install: applications_desktop icons_hicolor_scalable_apps build
5872
$(CABAL) --require-sandbox install -j -w $(STACK_GHC_EXE) --enable-relocatable
5973

6074
release: check build
6175
$(CABAL) sdist
6276

63-
run_gui: install
77+
run_gui: cabal_install
6478
./.cabal-sandbox/bin/gifcurry_gui
6579

66-
run_cli: install
80+
run_cli: cabal_install
6781
./.cabal-sandbox/bin/gifcurry_cli $(CLI_ARGS)
6882

6983
build_docs: setup
7084
$(CABAL) haddock --hyperlink-source \
7185
--html-location='http://hackage.haskell.org/package/Gifcurry/docs' \
7286
--contents-location='http://hackage.haskell.org/package/Gifcurry' && \
87+
mkdir -p ./haddock && \
7388
cp -R ./dist/doc/html/Gifcurry/ ./haddock/Gifcurry-$(VERSION)-docs && \
7489
cd ./haddock && \
7590
tar --format=ustar -cvf ./Gifcurry-$(VERSION)-docs.tar Gifcurry-$(VERSION)-docs
76-
77-
# Begin Arch Linux Specific
78-
arch_os_build_gifcurry: setup update clean sandbox_clean alex happy haskell_gi gtk2hs_buildtools arch_os_install_dependencies arch_os_configure arch_os_build
79-
80-
arch_os_install_dependencies: sandbox
81-
$(CABAL) --require-sandbox install -j -w $(STACK_GHC_EXE) --force-reinstalls --reinstall --only-dependencies
82-
83-
arch_os_configure: sandbox
84-
$(CABAL) --require-sandbox configure -w $(STACK_GHC_EXE) --prefix=$(PREFIX)
85-
86-
arch_os_build: arch_os_configure
87-
$(CABAL) --require-sandbox build -j
88-
89-
arch_os_install_gifcurry: arch_os_build
90-
$(CABAL) --require-sandbox copy --destdir=$(DESTDIR)
91-
# End Arch Linux Specific

packaging/linux/app-image/gifcurry-app-image-install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# (C) 2017 David Lettier
44
# lettier.com
55

6-
GIFCURRY_VERSION="3.0.0.0"
6+
GIFCURRY_VERSION="3.0.0.1"
77
GIFCURRY_RELEASES_DOWNLOAD="https://github.com/lettier/gifcurry/releases/download/$GIFCURRY_VERSION"
88
GIFCURRY_PACKAGING_LINUX_COMMON="https://raw.githubusercontent.com/lettier/gifcurry/master/packaging/linux/common"
99
GIFCURRY_APP_IMAGE="gifcurry-$GIFCURRY_VERSION-x86_64.AppImage"

packaging/linux/app-image/gifcurry.appdata.xml

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,25 @@
55
<metadata_license>CC-BY-SA-3.0</metadata_license>
66
<project_license>BSD-3-Clause</project_license>
77
<name>Gifcurry</name>
8-
<summary>Your open source video to GIF maker built with Haskell.</summary>
8+
<summary>Your open source video to GIF maker built with Haskell</summary>
9+
<description>
10+
<p>
11+
Gifcurry is your open source video to GIF maker built with Haskell.
12+
Import a video, trim, crop, add text, pick a font, set the size, and
13+
save your creation as a GIF or a video. Making GIFs with Gifcurry is
14+
fun so try it out!
15+
</p>
16+
</description>
917
<launchable type="desktop-id">gifcurry.desktop</launchable>
1018
<screenshots>
11-
<screenshot type="default">
12-
<caption>The main Gifcurry window.</caption>
13-
<image type="source" width="1003" height="468">https://i.imgur.com/er3AQjP.png</image>
14-
</screenshot>
15-
<screenshot>
16-
<caption>The about Gifcurry window.</caption>
17-
<image type="source" width="715" height="448">https://i.imgur.com/NMadQxQ.png</image>
18-
</screenshot>
19+
<screenshot type="default">
20+
<caption>The main Gifcurry window.</caption>
21+
<image type="source" width="1003" height="468">https://i.imgur.com/er3AQjP.png</image>
22+
</screenshot>
23+
<screenshot>
24+
<caption>The about Gifcurry window.</caption>
25+
<image type="source" width="715" height="448">https://i.imgur.com/NMadQxQ.png</image>
26+
</screenshot>
1927
</screenshots>
2028
<url type="homepage">https://github.com/lettier/gifcurry</url>
2129
<provides>

packaging/linux/arch-aur/PKGBUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Maintainer: Lettier <gifcurry_aur a@@at@t lettier dd.ot..t ccommm>
22

33
_name=gifcurry
4-
_ver=3.0.0.0
4+
_ver=3.0.0.1
55
_xrev=0
66

77
pkgname=${_name}

packaging/linux/snap/snapcraft.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: gifcurry
2-
version: '3.0.0.0'
2+
version: '3.0.0.1'
33
summary: Your open source video to GIF maker.
44
type: app
55
description: |

0 commit comments

Comments
 (0)