[xiph-commits] r15362 - in trunk/ffmpeg2theora: . kino_export

j at svn.xiph.org j at svn.xiph.org
Wed Oct 1 04:25:56 PDT 2008 

Author: j
Date: 2008-10-01 04:25:56 -0700 (Wed, 01 Oct 2008)
New Revision: 15362

Added:
   trunk/ffmpeg2theora/Makefile
Removed:
   trunk/ffmpeg2theora/Makefile.am
   trunk/ffmpeg2theora/autogen.sh
   trunk/ffmpeg2theora/configure.ac
   trunk/ffmpeg2theora/kino_export/Makefile.am
Modified:
   trunk/ffmpeg2theora/
   trunk/ffmpeg2theora/ChangeLog
Log:
remove autotools build system


Property changes on: trunk/ffmpeg2theora
___________________________________________________________________
Name: bzr:revision-info
   - timestamp: 2008-10-01 12:32:46.611999989 +0200
committer: j
properties: 
	branch-nick: ffmpeg2theora

   + timestamp: 2008-10-01 12:40:39.855999947 +0200
committer: j
properties: 
	branch-nick: ffmpeg2theora.scons

Name: bzr:file-ids
   - INSTALL	6863 at 0101bb08-14d6-0310-b084-bc0e0c8e3800:trunk%2Fffmpeg2theora:INSTALL

   + ChangeLog	6863 at 0101bb08-14d6-0310-b084-bc0e0c8e3800:trunk%2Fffmpeg2theora:ChangeLog
Makefile	makefile-20081001103707-vrfgzbk3waqvaci1-1

Name: bzr:revision-id:v3-single1-dHJ1bmsvZmZtcGVnMnRoZW9yYQ..
   - 191 j-20080517230830-he5x8v2m8yrfiw35
192 j-20080518224037-pkmoctzf4qce7tog
193 j-20080518224409-6hbfp3k2ssn6egqa
194 j-20080520111939-dhi52qwbqe7a47cu
195 j-20080523092252-gj9k9db0s67vl7dw
196 j-20080523092420-l0850yrq1qkgz9t0
197 j-20080523093057-l5g0ezzy5geu0pey
198 j-20080523094343-kcno1dm2e1lr38q4
199 j-20080523163006-kjl6ewea5sxawmq2
200 j-20080523165904-l2vm52qae0hlqkhp
201 j-20080523175432-2ed953iktnl8c7cr
202 j-20080525100939-7oja8pk08v9fquiw
203 j-20080526111321-nhzaqh6ivzn0vs7b
204 j-20080527100851-2v5eyxxrq1riqi50
205 j-20080527101341-9ynbgth2b15jw792
206 j-20080527205556-19tffvfrxgt3khld
207 j-20080527205840-zeestdde3v1zks9k
208 j-20080527210129-e73y56uwmzbcid00
209 j-20080527211813-5ll680ed1q4byp16
210 j-20080528102006-aeippim0tn70mz3f
211 j-20080528104907-40kiidjojvta8j61
212 j-20080528111329-vkqbt7xkat2o9h4z
213 j-20080529102940-q9xdwm5v9espzomv
214 j-20080529111405-nmh99aon1kmh22qm
215 j-20080530094948-ncq064s4uggd9z95
216 j-20080530095056-hko2vjfwipikwjyu
217 j-20080530171822-bab8sy8lpotf8081
218 j-20080603170442-v0pxspvfcucvsaex
219 j-20080617110355-xwbeg1xidmv8fubp
220 j-20080617110518-khqlhaan52kz3lii
221 j-20080723194934-63m20dc3zmkhwj4o
222 j-20080724140108-ntgbrk6913nvtk4b
223 j-20080802221321-3fcp0s6rehryx0n5
224 j-20080802221340-0s6mh8llk6nyon5d
225 j-20080901112127-tyeax385hwukjt13
226 j-20080915075112-fg3yc8radbplosnc
227 j-20080921103515-w89p8jqwt3oq5u20
228 j-20080921103703-prnl3ls2f6u4g177
229 j-20080921104137-otk3xx827h5cofwl
230 j-20080921104242-dswny7jm93stokej
231 j-20081001102101-rl2rf1x9u8e5zrqk
232 j-20081001103246-0uwni13nt5b2mqyw

   + 191 j-20080517230830-he5x8v2m8yrfiw35
192 j-20080518224037-pkmoctzf4qce7tog
193 j-20080518224409-6hbfp3k2ssn6egqa
194 j-20080520111939-dhi52qwbqe7a47cu
195 j-20080523092252-gj9k9db0s67vl7dw
196 j-20080523092420-l0850yrq1qkgz9t0
197 j-20080523093057-l5g0ezzy5geu0pey
198 j-20080523094343-kcno1dm2e1lr38q4
199 j-20080523163006-kjl6ewea5sxawmq2
200 j-20080523165904-l2vm52qae0hlqkhp
201 j-20080523175432-2ed953iktnl8c7cr
202 j-20080525100939-7oja8pk08v9fquiw
203 j-20080526111321-nhzaqh6ivzn0vs7b
204 j-20080527100851-2v5eyxxrq1riqi50
205 j-20080527101341-9ynbgth2b15jw792
206 j-20080527205556-19tffvfrxgt3khld
207 j-20080527205840-zeestdde3v1zks9k
208 j-20080527210129-e73y56uwmzbcid00
209 j-20080527211813-5ll680ed1q4byp16
210 j-20080528102006-aeippim0tn70mz3f
211 j-20080528104907-40kiidjojvta8j61
212 j-20080528111329-vkqbt7xkat2o9h4z
213 j-20080529102940-q9xdwm5v9espzomv
214 j-20080529111405-nmh99aon1kmh22qm
215 j-20080530094948-ncq064s4uggd9z95
216 j-20080530095056-hko2vjfwipikwjyu
217 j-20080530171822-bab8sy8lpotf8081
218 j-20080603170442-v0pxspvfcucvsaex
219 j-20080617110355-xwbeg1xidmv8fubp
220 j-20080617110518-khqlhaan52kz3lii
221 j-20080723194934-63m20dc3zmkhwj4o
222 j-20080724140108-ntgbrk6913nvtk4b
223 j-20080802221321-3fcp0s6rehryx0n5
224 j-20080802221340-0s6mh8llk6nyon5d
225 j-20080901112127-tyeax385hwukjt13
226 j-20080915075112-fg3yc8radbplosnc
227 j-20080921103515-w89p8jqwt3oq5u20
228 j-20080921103703-prnl3ls2f6u4g177
229 j-20080921104137-otk3xx827h5cofwl
230 j-20080921104242-dswny7jm93stokej
231 j-20081001102101-rl2rf1x9u8e5zrqk
232 j-20081001103246-0uwni13nt5b2mqyw
233 j-20081001104039-68e6rbv58e743plv


Modified: trunk/ffmpeg2theora/ChangeLog
===================================================================
--- trunk/ffmpeg2theora/ChangeLog	2008-10-01 11:25:43 UTC (rev 15361)
+++ trunk/ffmpeg2theora/ChangeLog	2008-10-01 11:25:56 UTC (rev 15362)
@@ -1,8 +1,9 @@
-0.22 ??? 
+0.22 svn
     - enable v4l input again (-f video4linux or -f video4linux2)
     - ability to set framerate for image sequences (--inputfps)
     - fix several memory leaks
     - if only width or height are given, the other is set to preserve aspect ratio
+    - remove autotools build system, only scons build is supported now.
 
 0.21 2008-05-19 
     - switch default extension to .ogv 

Added: trunk/ffmpeg2theora/Makefile
===================================================================
--- trunk/ffmpeg2theora/Makefile	                        (rev 0)
+++ trunk/ffmpeg2theora/Makefile	2008-10-01 11:25:56 UTC (rev 15362)
@@ -0,0 +1,8 @@
+all:
+	scons
+
+clean:
+	scons -c
+
+install:
+	scons install

Deleted: trunk/ffmpeg2theora/Makefile.am
===================================================================
--- trunk/ffmpeg2theora/Makefile.am	2008-10-01 11:25:43 UTC (rev 15361)
+++ trunk/ffmpeg2theora/Makefile.am	2008-10-01 11:25:56 UTC (rev 15362)
@@ -1,16 +0,0 @@
-AUTOMAKE_OPTIONS = 1.8 dist-bzip2 no-dist-gzip
-
-SUBDIRS = kino_export
-
-EXTRA_DIST = Makefile get_ffmpeg_svn.sh \
-             ffmpeg2theora.1 \
-             get_libkate.sh subtitles.txt
-
-bin_PROGRAMS = ffmpeg2theora
-
-ffmpeg2theora_SOURCES = src/ffmpeg2theora.c src/theorautils.c src/subtitles.c \
-                        src/ffmpeg2theora.h src/theorautils.h src/subtitles.h
-ffmpeg2theora_LDFLAGS = -L$(prefix)/lib @XIPH_LIBS@ @KATE_LIBS@ @FFMPEG_LIBS@
-ffmpeg2theora_CFLAGS = -I./src @XIPH_CFLAGS@ @KATE_CFLAGS@ @FFMPEG_CFLAGS@
-
-man_MANS = ffmpeg2theora.1

Deleted: trunk/ffmpeg2theora/autogen.sh
===================================================================
--- trunk/ffmpeg2theora/autogen.sh	2008-10-01 11:25:43 UTC (rev 15361)
+++ trunk/ffmpeg2theora/autogen.sh	2008-10-01 11:25:56 UTC (rev 15362)
@@ -1,3 +0,0 @@
-#! /bin/sh
-autoreconf -v --install || exit 1
-./configure --enable-maintainer-mode "$@"

Deleted: trunk/ffmpeg2theora/configure.ac
===================================================================
--- trunk/ffmpeg2theora/configure.ac	2008-10-01 11:25:43 UTC (rev 15361)
+++ trunk/ffmpeg2theora/configure.ac	2008-10-01 11:25:56 UTC (rev 15362)
@@ -1,62 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.59)
-AC_INIT(ffmpeg2theora,0.21+svn)
-AC_CONFIG_SRCDIR([Makefile.am])
-AM_INIT_AUTOMAKE([dist-bzip2])
-
-AC_PROG_CC
-AM_PROG_CC_C_O
-AM_PROG_LIBTOOL
-
-AC_SYS_LARGEFILE
-
-AC_MSG_CHECKING(whether to link statically)
-AC_ARG_WITH(static-linking,
-[  --with-static-linking   Link binaries statically],
-[ case "$withval" in
-  no)
-     AC_MSG_RESULT(no)
-     ;;
-  *)
-    AC_MSG_RESULT(yes)
-    LDFLAGS="-static $LDFLAGS"
-    ;;
-  esac],
-AC_MSG_RESULT(no)
-)
-
-PKG_CHECK_MODULES(XIPH,ogg >= 1.1 vorbis vorbisenc theora >= 1.0beta1)
-AC_SUBST(XIPH_CFLAGS)
-AC_SUBST(XIPH_LIBS)
-
-export PKG_CONFIG_PATH=./libkate/misc/pkgconfig:./libkate/pkg/pkgconfig:$PKG_CONFIG_PATH
-PKG_CHECK_MODULES(KATE,oggkate >= 0.1.3,
-                  KATE_CFLAGS="-DHAVE_KATE -DHAVE_OGGKATE $KATE_CFLAGS",
-                  [AC_MSG_RESULT(
-
-.     Could not find libkate. Subtitles support will be disabled.
-      You can also run ./get_libkate.sh (for more information see INSTALL)
-      or update PKG_CONFIG_PATH to point to libkate's source folder
-)]
-)
-AC_SUBST(KATE_LIBS)
-AC_SUBST(KATE_CFLAGS)
-
-export PKG_CONFIG_PATH=./ffmpeg/libavutil:./ffmpeg/libavformat:./ffmpeg/libavcodec:./ffmpeg/libavdevice:./ffmpeg/libswscale:./ffmpeg/libpostproc:$PKG_CONFIG_PATH
-PKG_CHECK_MODULES(FFMPEG, libavformat libavcodec libavdevice libswscale libpostproc, HAVE_FFMPEG=yes, 
-        AC_MSG_ERROR([
-
-.     Could not find libavformat libavcodec libavdevice libswscale libpostproc.
-      You can install it via
-       sudo apt-get install libavformat-dev libavcodec-dev libavdevice-dev libswscale-dev libpostproc-dev
-      or update PKG_CONFIG_PATH to point to ffmpeg's source folder
-      or run ./get_ffmpeg_svn.sh (for more information see INSTALL)
-])
-)
-AC_SUBST(FFMPEG_CFLAGS)
-AC_SUBST(FFMPEG_LIBS)
-
-AC_OUTPUT([
-	Makefile
-	kino_export/Makefile
-])

Deleted: trunk/ffmpeg2theora/kino_export/Makefile.am
===================================================================
--- trunk/ffmpeg2theora/kino_export/Makefile.am	2008-10-01 11:25:43 UTC (rev 15361)
+++ trunk/ffmpeg2theora/kino_export/Makefile.am	2008-10-01 11:25:56 UTC (rev 15362)
@@ -1 +0,0 @@
-EXTRA_DIST=README ffmpeg2theora.sh

More information about the commits mailing list