From e99b5494b0c7ba0ebe227d62cb3d9089da2e43bd Mon Sep 17 00:00:00 2001
From: Alex Xu <alex_y_xu@yahoo.ca>
Date: Tue, 4 Mar 2014 18:27:44 -0500
Subject: bleh

---
 .travis.sh  | 5 +----
 .travis.yml | 4 ++++
 Makefile    | 6 ++++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.travis.sh b/.travis.sh
index 5ae4dd0..dc3c48a 100755
--- a/.travis.sh
+++ b/.travis.sh
@@ -75,9 +75,7 @@ case "$1" in
     cd ..
     rm -rf ffmpeg
 
-    patch -p0 <<EOF
---- apngasm.c
-+++ apngasm.c
+    patch -o - apngasm.c | gcc -x c -o apngasm -Wall $CFLAGS - $(pkg-config --libs libpng --libs zlib) <<EOF
 @@ -29,6 +29,7 @@
   */
  #include <stdio.h>
@@ -87,7 +85,6 @@ case "$1" in
  #include "zlib.h"
  
 EOF
-    make LDLIBS="$(pkg-config --libs libpng --libs zlib)" apngasm
     sudo install -c -m755 apngasm /usr/local/bin
     rm apngasm apngasm.c
 
diff --git a/.travis.yml b/.travis.yml
index 1f9fcc1..aff5141 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,3 +11,7 @@ notifications:
     - alex_y_xu@yahoo.ca
   irc:
     "chat.freenode.net#html5ks"
+    template:
+      - "%{repository_name}#%{build_number} of %{commit} on %{branch} by %{author} took %{duration} and ended: %{message}"
+      - "Compare: %{compare_url}"
+      - "Build details: %{build_url}"
diff --git a/Makefile b/Makefile
index 855d44d..3d854ca 100644
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,8 @@ APNGASM ?= apngasm
 NPM ?= npm
 DUGLIFYJS := node_modules/uglify-js/bin/uglifyjs
 UGLIFYJS ?= $(DUGLIFYJS)
+#PACKR ?= packr
+#CLOSURE_COMPILER ?= java -jar compiler.jar
 ifndef MINIMAL
 ZOPFLIPNG ?= zopflipng
 DEFLOPT ?= wine DeflOpt
@@ -58,7 +60,7 @@ ifdef NOTEMP
 else
 %.vp9.webm: %.y4m
 endif
-	$(FFMPEG) -i "$<" -strict -2 -c:v libvpx-vp9 -crf 8 -b:v 1M -c:a libopus -vbr 1 -b:a 64k "$@"
+	$(FFMPEG) -i "$<" -strict -2 -c:v libvpx-vp9 -crf 8 -b:v 1M -c:a libopus -vbr on -b:a 64k "$@"
 
 ifdef NOTEMP
 %.ogv: %.mkv
@@ -81,7 +83,7 @@ audio: $(CAUDIO)
 	$(FFMPEG) -i "$<" -c:a pcm_s16le "$@"
 
 %.opus: %.wav
-	$(FFMPEG) -i "$<" -c:a libopus -vbr 1 -b:a 64k "$@"
+	$(FFMPEG) -i "$<" -c:a libopus -vbr on -b:a 64k "$@"
 
 %.m4a: %.wav
 	$(FFMPEG) -i "$<" -b:a 60k "$@"
-- 
cgit v1.2.3-54-g00ecf