- TRAVIS: Install -dev packages for dependend libraries, where possible.

- Force API version for libvorbisenc, as distributions may NOT have a default libvorbis.so (maybe due to a missing -dev package)
Xliff · May 2, 2016 · fa4c0a7 · fa4c0a7
1 parent 20ede0b
commit fa4c0a7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,8 +5,9 @@ perl6:
   - 2016.01
 before_install:
   - sudo apt-get -qq update
-  - sudo apt-get install -y libogg0 libvorbis0a libvorbisenc2
+  - sudo apt-get install -y libogg-dev libvorbis-dev
 install:
   - rakudobrew build-panda ${TRAVIS_PERL6_VERSION#latest}
   - panda installdeps .
+  - panda install JSON::Fast
   - panda install Test::META
diff --git a/lib/Audio/OggVorbis/VorbisEnc.pm b/lib/Audio/OggVorbis/VorbisEnc.pm
@@ -4,6 +4,7 @@ use NativeCall;
 use Audio::OggVorbis::Vorbis;
 
 constant LIB = 'vorbisenc';
+constant VER = v2;
 
 # == /usr/include/vorbis/vorbisenc.h ==
 
@@ -38,7 +39,7 @@ sub vorbis_encode_init(
 	,long                   $max_bitrate 		# long int
 	,long                   $nominal_bitrate 	# long int
 	,long                   $min_bitrate 		# long int
-) is native(LIB) returns int32 is export { * }
+) is native(LIB,VER) returns int32 is export { * }
 
 
 sub vorbis_encode_setup_managed(
@@ -48,34 +49,34 @@ sub vorbis_encode_setup_managed(
 	,long                   $max_bitrate 		# long int
 	,long                   $nominal_bitrate 	# long int
 	,long                   $min_bitrate 		# long int
-) is native(LIB) returns int32 is export { * }
+) is native(LIB,VER) returns int32 is export { * }
 
 sub vorbis_encode_setup_vbr(
 	vorbis_info             $vi 			# Typedef<vorbis_info>->|vorbis_info|*
 	,long                   $channels 		# long int
 	,long                   $rate 			# long int
 	,num32                  $quality 		# float
-) is native(LIB) returns int32 is export { * }
+) is native(LIB,VER) returns int32 is export { * }
 
 
 sub vorbis_encode_init_vbr(
 	vorbis_info				$vi 			# Typedef<vorbis_info>->|vorbis_info|*
 	,long                   $channels 		# long int
 	,long                   $rate 			# long int
 	,num32                  $base_quality 	# float
-) is native(LIB) returns int32 is export { * }
+) is native(LIB,VER) returns int32 is export { * }
 
 
 #extern int vorbis_encode_setup_init(vorbis_info *vi);
 sub vorbis_encode_setup_init(
 	vorbis_info 			$vi 		# Typedef<vorbis_info>->|vorbis_info|*
-) is native(LIB) returns int32 is export { * }
+) is native(LIB,VER) returns int32 is export { * }
 
 
 #extern int vorbis_encode_ctl(vorbis_info *vi,int number,void *arg);
 sub vorbis_encode_ctl(
 	vorbis_info             $vi 		# Typedef<vorbis_info>->|vorbis_info|*
 	,int32                  $number 	# int
 	,Pointer                $arg 		# void*
-) is native(LIB) returns int32 is export { * }
+) is native(LIB,VER) returns int32 is export { * }