diff options
| author | Sam Bingner <sam@bingner.com> | 2019-04-03 15:47:56 -1000 |
|---|---|---|
| committer | Sam Bingner <sam@bingner.com> | 2019-04-09 23:20:37 -1000 |
| commit | 4dfb7051ae39881c430b3b3811383e7f115942d3 (patch) | |
| tree | 9c9ada5d40d70fe91ade324b5012c38915e25af6 /data | |
| parent | 8751b370bf2f0cc566f49a3140fe7f632fb3bb0a (diff) | |
Fix libtheora compiling and rename ogg, vorbis, and theora
Diffstat (limited to 'data')
| -rw-r--r-- | data/libogg/_metadata/conflicts | 1 | ||||
| -rw-r--r-- | data/libogg/_metadata/description (renamed from data/ogg/_metadata/description) | 0 | ||||
| -rw-r--r-- | data/libogg/_metadata/in.1443.00 (renamed from data/ogg/_metadata/in.1443.00) | 0 | ||||
| -rw-r--r-- | data/libogg/_metadata/license (renamed from data/ogg/_metadata/license) | 0 | ||||
| l--------- | data/libogg/_metadata/maintainer (renamed from data/ogg/_metadata/maintainer) | 0 | ||||
| -rw-r--r-- | data/libogg/_metadata/priority (renamed from data/ogg/_metadata/priority) | 0 | ||||
| -rw-r--r-- | data/libogg/_metadata/provides | 1 | ||||
| -rw-r--r-- | data/libogg/_metadata/replaces | 1 | ||||
| -rw-r--r-- | data/libogg/_metadata/role (renamed from data/ogg/_metadata/role) | 0 | ||||
| -rw-r--r-- | data/libogg/_metadata/section (renamed from data/ogg/_metadata/section) | 0 | ||||
| -rw-r--r-- | data/libogg/_metadata/tags (renamed from data/ogg/_metadata/tags) | 0 | ||||
| -rw-r--r-- | data/libogg/_metadata/version (renamed from data/ogg/_metadata/version) | 0 | ||||
| -rw-r--r-- | data/libogg/libogg-1.3.3.tar.gz (renamed from data/ogg/libogg-1.3.3.tar.gz) | bin | 579853 -> 579853 bytes | |||
| -rw-r--r-- | data/libogg/make.sh (renamed from data/ogg/make.sh) | 0 | ||||
| -rw-r--r-- | data/libtheora/_metadata/description (renamed from data/theora/_metadata/description) | 0 | ||||
| -rw-r--r-- | data/libtheora/_metadata/in.1443.00 (renamed from data/theora/_metadata/in.1443.00) | 0 | ||||
| l--------- | data/libtheora/_metadata/libogg.dep | 1 | ||||
| l--------- | data/libtheora/_metadata/libvorbis.dep | 1 | ||||
| -rw-r--r-- | data/libtheora/_metadata/license (renamed from data/theora/_metadata/license) | 0 | ||||
| l--------- | data/libtheora/_metadata/maintainer (renamed from data/theora/_metadata/maintainer) | 0 | ||||
| -rw-r--r-- | data/libtheora/_metadata/priority (renamed from data/theora/_metadata/priority) | 0 | ||||
| -rw-r--r-- | data/libtheora/_metadata/role (renamed from data/theora/_metadata/role) | 0 | ||||
| -rw-r--r-- | data/libtheora/_metadata/section (renamed from data/theora/_metadata/section) | 0 | ||||
| -rw-r--r-- | data/libtheora/_metadata/tags (renamed from data/theora/_metadata/tags) | 0 | ||||
| -rw-r--r-- | data/libtheora/_metadata/version (renamed from data/theora/_metadata/version) | 0 | ||||
| -rw-r--r-- | data/libtheora/info.diff | 31 | ||||
| -rw-r--r-- | data/libtheora/libtheora-1.1.1.tar.bz2 (renamed from data/theora/libtheora-1.1.1.tar.bz2) | bin | 1903175 -> 1903175 bytes | |||
| -rw-r--r-- | data/libtheora/make.sh (renamed from data/theora/make.sh) | 0 | ||||
| -rw-r--r-- | data/libvorbis/_metadata/conflicts | 1 | ||||
| -rw-r--r-- | data/libvorbis/_metadata/description (renamed from data/vorbis/_metadata/description) | 0 | ||||
| -rw-r--r-- | data/libvorbis/_metadata/in.1443.00 (renamed from data/vorbis/_metadata/in.1443.00) | 0 | ||||
| l--------- | data/libvorbis/_metadata/libogg.dep | 1 | ||||
| -rw-r--r-- | data/libvorbis/_metadata/license (renamed from data/vorbis/_metadata/license) | 0 | ||||
| l--------- | data/libvorbis/_metadata/maintainer (renamed from data/vorbis/_metadata/maintainer) | 0 | ||||
| -rw-r--r-- | data/libvorbis/_metadata/priority (renamed from data/vorbis/_metadata/priority) | 0 | ||||
| -rw-r--r-- | data/libvorbis/_metadata/provides | 1 | ||||
| -rw-r--r-- | data/libvorbis/_metadata/replaces | 1 | ||||
| -rw-r--r-- | data/libvorbis/_metadata/role (renamed from data/vorbis/_metadata/role) | 0 | ||||
| -rw-r--r-- | data/libvorbis/_metadata/section (renamed from data/vorbis/_metadata/section) | 0 | ||||
| -rw-r--r-- | data/libvorbis/_metadata/tags (renamed from data/vorbis/_metadata/tags) | 0 | ||||
| -rw-r--r-- | data/libvorbis/_metadata/version (renamed from data/vorbis/_metadata/version) | 0 | ||||
| -rw-r--r-- | data/libvorbis/make.sh (renamed from data/vorbis/make.sh) | 0 | ||||
| -rw-r--r-- | data/libvorbis/v1.3.6.tar.gz (renamed from data/vorbis/v1.3.6.tar.gz) | bin | 1223948 -> 1223948 bytes | |||
| -rw-r--r-- | data/ogg/_metadata/name | 1 | ||||
| -rw-r--r-- | data/theora/_metadata/name | 1 | ||||
| l--------- | data/theora/_metadata/ogg.dep | 1 | ||||
| l--------- | data/theora/_metadata/vorbis.dep | 1 | ||||
| -rw-r--r-- | data/vorbis/_metadata/name | 1 | ||||
| l--------- | data/vorbis/_metadata/ogg.dep | 1 |
49 files changed, 40 insertions, 6 deletions
diff --git a/data/libogg/_metadata/conflicts b/data/libogg/_metadata/conflicts new file mode 100644 index 000000000..506ceaa1e --- /dev/null +++ b/data/libogg/_metadata/conflicts @@ -0,0 +1 @@ +ogg diff --git a/data/ogg/_metadata/description b/data/libogg/_metadata/description index c7a8d1c9b..c7a8d1c9b 100644 --- a/data/ogg/_metadata/description +++ b/data/libogg/_metadata/description diff --git a/data/ogg/_metadata/in.1443.00 b/data/libogg/_metadata/in.1443.00 index e69de29bb..e69de29bb 100644 --- a/data/ogg/_metadata/in.1443.00 +++ b/data/libogg/_metadata/in.1443.00 diff --git a/data/ogg/_metadata/license b/data/libogg/_metadata/license index 6111c6c5a..6111c6c5a 100644 --- a/data/ogg/_metadata/license +++ b/data/libogg/_metadata/license diff --git a/data/ogg/_metadata/maintainer b/data/libogg/_metadata/maintainer index 573d7ebef..573d7ebef 120000 --- a/data/ogg/_metadata/maintainer +++ b/data/libogg/_metadata/maintainer diff --git a/data/ogg/_metadata/priority b/data/libogg/_metadata/priority index 134d9bc32..134d9bc32 100644 --- a/data/ogg/_metadata/priority +++ b/data/libogg/_metadata/priority diff --git a/data/libogg/_metadata/provides b/data/libogg/_metadata/provides new file mode 100644 index 000000000..506ceaa1e --- /dev/null +++ b/data/libogg/_metadata/provides @@ -0,0 +1 @@ +ogg diff --git a/data/libogg/_metadata/replaces b/data/libogg/_metadata/replaces new file mode 100644 index 000000000..506ceaa1e --- /dev/null +++ b/data/libogg/_metadata/replaces @@ -0,0 +1 @@ +ogg diff --git a/data/ogg/_metadata/role b/data/libogg/_metadata/role index 8d0320866..8d0320866 100644 --- a/data/ogg/_metadata/role +++ b/data/libogg/_metadata/role diff --git a/data/ogg/_metadata/section b/data/libogg/_metadata/section index 593877746..593877746 100644 --- a/data/ogg/_metadata/section +++ b/data/libogg/_metadata/section diff --git a/data/ogg/_metadata/tags b/data/libogg/_metadata/tags index a8928cec8..a8928cec8 100644 --- a/data/ogg/_metadata/tags +++ b/data/libogg/_metadata/tags diff --git a/data/ogg/_metadata/version b/data/libogg/_metadata/version index 31e5c8434..31e5c8434 100644 --- a/data/ogg/_metadata/version +++ b/data/libogg/_metadata/version diff --git a/data/ogg/libogg-1.3.3.tar.gz b/data/libogg/libogg-1.3.3.tar.gz Binary files differindex b39fdfe49..b39fdfe49 100644 --- a/data/ogg/libogg-1.3.3.tar.gz +++ b/data/libogg/libogg-1.3.3.tar.gz diff --git a/data/ogg/make.sh b/data/libogg/make.sh index 452a4bfd5..452a4bfd5 100644 --- a/data/ogg/make.sh +++ b/data/libogg/make.sh diff --git a/data/theora/_metadata/description b/data/libtheora/_metadata/description index 6eae3e880..6eae3e880 100644 --- a/data/theora/_metadata/description +++ b/data/libtheora/_metadata/description diff --git a/data/theora/_metadata/in.1443.00 b/data/libtheora/_metadata/in.1443.00 index e69de29bb..e69de29bb 100644 --- a/data/theora/_metadata/in.1443.00 +++ b/data/libtheora/_metadata/in.1443.00 diff --git a/data/libtheora/_metadata/libogg.dep b/data/libtheora/_metadata/libogg.dep new file mode 120000 index 000000000..c88b8bd5c --- /dev/null +++ b/data/libtheora/_metadata/libogg.dep @@ -0,0 +1 @@ +../../libogg
\ No newline at end of file diff --git a/data/libtheora/_metadata/libvorbis.dep b/data/libtheora/_metadata/libvorbis.dep new file mode 120000 index 000000000..2196d93e3 --- /dev/null +++ b/data/libtheora/_metadata/libvorbis.dep @@ -0,0 +1 @@ +../../libvorbis
\ No newline at end of file diff --git a/data/theora/_metadata/license b/data/libtheora/_metadata/license index c8ccce4ff..c8ccce4ff 100644 --- a/data/theora/_metadata/license +++ b/data/libtheora/_metadata/license diff --git a/data/theora/_metadata/maintainer b/data/libtheora/_metadata/maintainer index 0c538aadb..0c538aadb 120000 --- a/data/theora/_metadata/maintainer +++ b/data/libtheora/_metadata/maintainer diff --git a/data/theora/_metadata/priority b/data/libtheora/_metadata/priority index 134d9bc32..134d9bc32 100644 --- a/data/theora/_metadata/priority +++ b/data/libtheora/_metadata/priority diff --git a/data/theora/_metadata/role b/data/libtheora/_metadata/role index 8d0320866..8d0320866 100644 --- a/data/theora/_metadata/role +++ b/data/libtheora/_metadata/role diff --git a/data/theora/_metadata/section b/data/libtheora/_metadata/section index 593877746..593877746 100644 --- a/data/theora/_metadata/section +++ b/data/libtheora/_metadata/section diff --git a/data/theora/_metadata/tags b/data/libtheora/_metadata/tags index a8928cec8..a8928cec8 100644 --- a/data/theora/_metadata/tags +++ b/data/libtheora/_metadata/tags diff --git a/data/theora/_metadata/version b/data/libtheora/_metadata/version index 524cb5524..524cb5524 100644 --- a/data/theora/_metadata/version +++ b/data/libtheora/_metadata/version diff --git a/data/libtheora/info.diff b/data/libtheora/info.diff new file mode 100644 index 000000000..7027a7c60 --- /dev/null +++ b/data/libtheora/info.diff @@ -0,0 +1,31 @@ +diff -ru libtheora-1.1.1/lib/Makefile.am libtheora-1.1.1+iPhone/lib/Makefile.am +--- libtheora-1.1.1/lib/Makefile.am 2009-09-25 05:20:06.000000000 -1000 ++++ libtheora-1.1.1+iPhone/lib/Makefile.am 2019-04-03 15:32:30.000000000 -1000 +@@ -79,6 +79,7 @@ + apiwrapper.c \ + fragment.c \ + idct.c \ ++ info.c \ + internal.c \ + state.c \ + quant.c \ +diff -ru libtheora-1.1.1/lib/Makefile.in libtheora-1.1.1+iPhone/lib/Makefile.in +--- libtheora-1.1.1/lib/Makefile.in 2009-10-01 08:04:07.000000000 -1000 ++++ libtheora-1.1.1+iPhone/lib/Makefile.in 2019-04-03 15:44:55.000000000 -1000 +@@ -207,6 +207,7 @@ + @THEORA_DISABLE_ENCODE_FALSE@ apiwrapper.c \ + @THEORA_DISABLE_ENCODE_FALSE@ fragment.c \ + @THEORA_DISABLE_ENCODE_FALSE@ idct.c \ ++@THEORA_DISABLE_ENCODE_FALSE@ info.c \ + @THEORA_DISABLE_ENCODE_FALSE@ internal.c \ + @THEORA_DISABLE_ENCODE_FALSE@ state.c \ + @THEORA_DISABLE_ENCODE_FALSE@ quant.c \ +@@ -369,7 +370,7 @@ + @CPU_x86_64_TRUE@@THEORA_DISABLE_ENCODE_FALSE@ $(am__objects_9) + @THEORA_DISABLE_ENCODE_TRUE@am__objects_11 = $(am__objects_7) + @THEORA_DISABLE_ENCODE_FALSE@am__objects_11 = apiwrapper.lo fragment.lo \ +-@THEORA_DISABLE_ENCODE_FALSE@ idct.lo internal.lo state.lo \ ++@THEORA_DISABLE_ENCODE_FALSE@ idct.lo info.lo internal.lo state.lo \ + @THEORA_DISABLE_ENCODE_FALSE@ quant.lo $(am__objects_10) \ + @THEORA_DISABLE_ENCODE_FALSE@ $(am__objects_7) + am_libtheoraenc_la_OBJECTS = $(am__objects_11) diff --git a/data/theora/libtheora-1.1.1.tar.bz2 b/data/libtheora/libtheora-1.1.1.tar.bz2 Binary files differindex 010e2a4ec..010e2a4ec 100644 --- a/data/theora/libtheora-1.1.1.tar.bz2 +++ b/data/libtheora/libtheora-1.1.1.tar.bz2 diff --git a/data/theora/make.sh b/data/libtheora/make.sh index c103eecaa..c103eecaa 100644 --- a/data/theora/make.sh +++ b/data/libtheora/make.sh diff --git a/data/libvorbis/_metadata/conflicts b/data/libvorbis/_metadata/conflicts new file mode 100644 index 000000000..fcc8705fd --- /dev/null +++ b/data/libvorbis/_metadata/conflicts @@ -0,0 +1 @@ +vorbis diff --git a/data/vorbis/_metadata/description b/data/libvorbis/_metadata/description index eb5bdee7c..eb5bdee7c 100644 --- a/data/vorbis/_metadata/description +++ b/data/libvorbis/_metadata/description diff --git a/data/vorbis/_metadata/in.1443.00 b/data/libvorbis/_metadata/in.1443.00 index e69de29bb..e69de29bb 100644 --- a/data/vorbis/_metadata/in.1443.00 +++ b/data/libvorbis/_metadata/in.1443.00 diff --git a/data/libvorbis/_metadata/libogg.dep b/data/libvorbis/_metadata/libogg.dep new file mode 120000 index 000000000..c88b8bd5c --- /dev/null +++ b/data/libvorbis/_metadata/libogg.dep @@ -0,0 +1 @@ +../../libogg
\ No newline at end of file diff --git a/data/vorbis/_metadata/license b/data/libvorbis/_metadata/license index 7cf076b68..7cf076b68 100644 --- a/data/vorbis/_metadata/license +++ b/data/libvorbis/_metadata/license diff --git a/data/vorbis/_metadata/maintainer b/data/libvorbis/_metadata/maintainer index 573d7ebef..573d7ebef 120000 --- a/data/vorbis/_metadata/maintainer +++ b/data/libvorbis/_metadata/maintainer diff --git a/data/vorbis/_metadata/priority b/data/libvorbis/_metadata/priority index 134d9bc32..134d9bc32 100644 --- a/data/vorbis/_metadata/priority +++ b/data/libvorbis/_metadata/priority diff --git a/data/libvorbis/_metadata/provides b/data/libvorbis/_metadata/provides new file mode 100644 index 000000000..fcc8705fd --- /dev/null +++ b/data/libvorbis/_metadata/provides @@ -0,0 +1 @@ +vorbis diff --git a/data/libvorbis/_metadata/replaces b/data/libvorbis/_metadata/replaces new file mode 100644 index 000000000..fcc8705fd --- /dev/null +++ b/data/libvorbis/_metadata/replaces @@ -0,0 +1 @@ +vorbis diff --git a/data/vorbis/_metadata/role b/data/libvorbis/_metadata/role index 8d0320866..8d0320866 100644 --- a/data/vorbis/_metadata/role +++ b/data/libvorbis/_metadata/role diff --git a/data/vorbis/_metadata/section b/data/libvorbis/_metadata/section index 593877746..593877746 100644 --- a/data/vorbis/_metadata/section +++ b/data/libvorbis/_metadata/section diff --git a/data/vorbis/_metadata/tags b/data/libvorbis/_metadata/tags index a8928cec8..a8928cec8 100644 --- a/data/vorbis/_metadata/tags +++ b/data/libvorbis/_metadata/tags diff --git a/data/vorbis/_metadata/version b/data/libvorbis/_metadata/version index 95b25aee2..95b25aee2 100644 --- a/data/vorbis/_metadata/version +++ b/data/libvorbis/_metadata/version diff --git a/data/vorbis/make.sh b/data/libvorbis/make.sh index 66a4b2105..66a4b2105 100644 --- a/data/vorbis/make.sh +++ b/data/libvorbis/make.sh diff --git a/data/vorbis/v1.3.6.tar.gz b/data/libvorbis/v1.3.6.tar.gz Binary files differindex 2a2a63000..2a2a63000 100644 --- a/data/vorbis/v1.3.6.tar.gz +++ b/data/libvorbis/v1.3.6.tar.gz diff --git a/data/ogg/_metadata/name b/data/ogg/_metadata/name deleted file mode 100644 index 4ed63f730..000000000 --- a/data/ogg/_metadata/name +++ /dev/null @@ -1 +0,0 @@ -Ogg diff --git a/data/theora/_metadata/name b/data/theora/_metadata/name deleted file mode 100644 index 15967a089..000000000 --- a/data/theora/_metadata/name +++ /dev/null @@ -1 +0,0 @@ -Theora diff --git a/data/theora/_metadata/ogg.dep b/data/theora/_metadata/ogg.dep deleted file mode 120000 index 3ac0dd64e..000000000 --- a/data/theora/_metadata/ogg.dep +++ /dev/null @@ -1 +0,0 @@ -../../ogg
\ No newline at end of file diff --git a/data/theora/_metadata/vorbis.dep b/data/theora/_metadata/vorbis.dep deleted file mode 120000 index aafc6d771..000000000 --- a/data/theora/_metadata/vorbis.dep +++ /dev/null @@ -1 +0,0 @@ -../../vorbis
\ No newline at end of file diff --git a/data/vorbis/_metadata/name b/data/vorbis/_metadata/name deleted file mode 100644 index 2197d3084..000000000 --- a/data/vorbis/_metadata/name +++ /dev/null @@ -1 +0,0 @@ -Vorbis diff --git a/data/vorbis/_metadata/ogg.dep b/data/vorbis/_metadata/ogg.dep deleted file mode 120000 index 3ac0dd64e..000000000 --- a/data/vorbis/_metadata/ogg.dep +++ /dev/null @@ -1 +0,0 @@ -../../ogg
\ No newline at end of file |