Changeset 4880Tweet

Timestamp:

Jun 13, 2014, 7:41:12 AM (9 years ago)

Author:

Sam Hocevar

Message:

build: update build system.

Location:

libpipi/trunk

Files:

• ThePimp/Makefile.am (modified) (2 diffs)
• bootstrap (modified) (1 diff)
• configure.ac (modified) (2 diffs)
• examples/dumpmovie.c (modified) (1 diff)
• examples/storyboard.c (modified) (1 diff)

libpipi/trunk/ThePimp/Makefile.am

@@ -1 +1 @@
 # $Id: $
 
-pkglibdir = $(libdir)/ThePimp
+mypkglibdir = $(libdir)/ThePimp
 
 pimp_sources = \
@@ -33 +33 @@
 
 if USE_CSHARP
-pkglib_DATA = ThePimp.exe
+mypkglib_DATA = ThePimp.exe
 bin_SCRIPTS = pimp
 endif

libpipi/trunk/bootstrap

@@ -38 +38 @@
 # Check for automake
 amvers="no"
-for v in 11 10 9 8 7 6 5; do
+for v in 15 14 13 12 11 10 9 8 7 6 5; do
   if automake-1.${v} --version >/dev/null 2>&1; then
     amvers="-1.${v}"

libpipi/trunk/configure.ac

@@ -5 +5 @@
 AC_CONFIG_AUX_DIR(.auto)
 AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE([no-define tar-ustar])
+AM_INIT_AUTOMAKE([subdir-objects no-define tar-ustar silent-rules])
 dnl AM_MAINTAINER_MODE
 
@@ -233 +233 @@
   PKG_CHECK_MODULES([LIBSWSCALE], [libswscale], [:], [ac_cv_my_have_ffmpeg=no])
 fi
+# Disable for now
+ac_cv_my_have_ffmpeg="no"
 if test "${ac_cv_my_have_ffmpeg}" != "no"; then
   AC_DEFINE(USE_FFMPEG, 1, Define to 1 to use FFmpeg)

libpipi/trunk/examples/dumpmovie.c

@@ -101 +101 @@
         }
 
-        avcodec_decode_video(ctx, frame, &finished, packet.data, packet.size);
+        avcodec_decode_video2(ctx, frame, &finished, packet.data, packet.size);
         if(!finished)
         {

libpipi/trunk/examples/storyboard.c

@@ -115 +115 @@
         }
 
-        avcodec_decode_video(ctx, frame, &finished, packet.data, packet.size);
+        avcodec_decode_video2(ctx, frame, &finished, packet.data, packet.size);
         if(!finished)
         {