summaryrefslogtreecommitdiff
path: root/games-fps
diff options
context:
space:
mode:
Diffstat (limited to 'games-fps')
-rw-r--r--games-fps/Manifest.gzbin12037 -> 12034 bytes
-rw-r--r--games-fps/alephone-durandal/Manifest4
-rw-r--r--games-fps/alephone-durandal/alephone-durandal-20240822.ebuild (renamed from games-fps/alephone-durandal/alephone-durandal-20221126.ebuild)2
-rw-r--r--games-fps/alephone-infinity/Manifest4
-rw-r--r--games-fps/alephone-infinity/alephone-infinity-20240822.ebuild (renamed from games-fps/alephone-infinity/alephone-infinity-20221126.ebuild)2
-rw-r--r--games-fps/alephone-marathon/Manifest4
-rw-r--r--games-fps/alephone-marathon/alephone-marathon-20240822.ebuild (renamed from games-fps/alephone-marathon/alephone-marathon-20221126.ebuild)2
-rw-r--r--games-fps/alephone/Manifest7
-rw-r--r--games-fps/alephone/alephone-20240822.ebuild (renamed from games-fps/alephone/alephone-20230119.ebuild)45
-rw-r--r--games-fps/alephone/alephone-99999999.ebuild43
-rw-r--r--games-fps/alephone/files/alephone-20230119-c99.patch99
11 files changed, 42 insertions, 170 deletions
diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index e8b87af63bda..df7e77997507 100644
--- a/games-fps/Manifest.gz
+++ b/games-fps/Manifest.gz
Binary files differ
diff --git a/games-fps/alephone-durandal/Manifest b/games-fps/alephone-durandal/Manifest
index 8e72df1dc01d..193b8a568095 100644
--- a/games-fps/alephone-durandal/Manifest
+++ b/games-fps/alephone-durandal/Manifest
@@ -1,3 +1,3 @@
-DIST Marathon2-20221126-Data.zip 29711060 BLAKE2B aa65a575a2b36a9b07cfc978042aa31485e2e02de7886fc7505ca430e7c8e67d1b2b9a77578777abe1042192f82bd7a40f2ab5e848d6a5d4a2e48ddd0b8f075d SHA512 18911eb415b66d6a698c56a6343eb319d9fd2baa34b408d26e0800f2028e0a5724556530beda8660b5f6b071e1544ad7ee59307888e6d021c7628c295e813147
-EBUILD alephone-durandal-20221126.ebuild 886 BLAKE2B a0e2efe227596b0479a5fe4c88835e0019c7eb2276387ebe967a7a8c74d82b52e7d6b4c92f6220c96cca70fc2ac84db8394b63de0795a12297ba2bfa283ba881 SHA512 2cbb2f6154faf25e02579bfc419a2b0a18291ae87cd019a1e9e4608c1ef0095d0bab6e68255601e62bfc633e19d0d338c8a569914926cc842cc82f53d951c061
+DIST Marathon2-20240822-Data.zip 28902408 BLAKE2B a0b2f0c565bd11b0f9360198f121d86ada6d76b2a49cce95a46285674135ec79ecaa267305804b167130603f791956c1aed03d653f1a0768301bdb5148b0e718 SHA512 65cedbc20b70f2ae6382e5dfa28cf1c108c4726b75d7c25fccae8e0d29a0cf60e8bdc8eca23fb4224131527e5be3dca732f4af22389ca61b2e531121969589db
+EBUILD alephone-durandal-20240822.ebuild 886 BLAKE2B 8deed4fed49beb2d683350df8e111a2330331c77e8a70bbe3baf201d5ea9ca7fde98ff2231d6859ff98309c57dc207fea1913a7d0d5dffb7fb72b9cbab7c48ad SHA512 c21343bb8242b20b255393c7ca00608b554b68711a18ad64825d240de904a067fa70bff272278130d335c11683a02ee4d4f6f865359dd79ca3e00473020e26c3
MISC metadata.xml 502 BLAKE2B 6137461c8262b053ace80fbacd23734a44e5292eb352be6eddddb4604030093a6df38c098cd1d9168e859f05c5f9552fd32b607dd31d5b42cf6ee285e7ca5b6c SHA512 ceaf745edb6876b9cc0558614718b601edfb2118a34090156fdfa3ddbbcdb3f27bb5658de587e0f95c612dca8638800352752e0616fb84cfa4e628f5b5a65549
diff --git a/games-fps/alephone-durandal/alephone-durandal-20221126.ebuild b/games-fps/alephone-durandal/alephone-durandal-20240822.ebuild
index ae8fcfa41812..2de0830a6d26 100644
--- a/games-fps/alephone-durandal/alephone-durandal-20221126.ebuild
+++ b/games-fps/alephone-durandal/alephone-durandal-20240822.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/games-fps/alephone-infinity/Manifest b/games-fps/alephone-infinity/Manifest
index ce188acaf685..9608befd4c4a 100644
--- a/games-fps/alephone-infinity/Manifest
+++ b/games-fps/alephone-infinity/Manifest
@@ -1,3 +1,3 @@
-DIST MarathonInfinity-20221126-Data.zip 32204262 BLAKE2B 35292a53b9983411c4fd07f4c424950c8d2588132f75153ce88d6b97fbb43638985be3f254c7ce847a5eb63fbaf757a0b3914d23fd3025bd1f4d8a7f374691da SHA512 8e245618d0ed9ed3b7944360fa2db36f9cc255510c04c8d45f168a43ed398965ebc5551b604cc59b51b37cacbf41ac0e4aaced046704cb095dadd4e585d2763a
-EBUILD alephone-infinity-20221126.ebuild 896 BLAKE2B 6cfd4774ecc5ccf513e81c9d0343bd1e38566bc300855dc50af25eb53787d9f44a94bb9e246310811df1b250bf16673bf2dd457664c6f22ff3cbf13f14e3bf46 SHA512 23c6369f428bee1161dc2f3c1e62b1ba93b952c094cd9364203a10342f729adebae62a6f9985e2f6158511d4e35aa0948f92a227aefbacf5a7dc1a5baa8c8b96
+DIST MarathonInfinity-20240822-Data.zip 31852152 BLAKE2B 8360a413a9d813b315d7c012965fa54ad480a99dad4e44135d2e4fbab96fa92b604f9004a0a0456f86fbda070c28c7fb504ad2d7aa7347eeb53633b036320d75 SHA512 354dac31983d5ff516c8326fdb915411d06b27a6e3089c0ced9723d1604aacce2e1cb299e1c59cbea06180c388472a8757091582c232693ae7c219bd9bb774a9
+EBUILD alephone-infinity-20240822.ebuild 896 BLAKE2B bf0e738329e59149895283fe098b8c430696d380e2886a45608f4a852fc6b3c7148a12b927bce20c5b27b7cb3d415ca0bbabb801ada0b1f27574f169b16bff0f SHA512 ea5a523014c34821642e36bbe42667f3ec7b4f00ae1ad62350f98d1cfbb46f4437c4749d9da7740002c4143cfdb694f0a330a18a150cc01f7a9c447b47cce60e
MISC metadata.xml 502 BLAKE2B 6137461c8262b053ace80fbacd23734a44e5292eb352be6eddddb4604030093a6df38c098cd1d9168e859f05c5f9552fd32b607dd31d5b42cf6ee285e7ca5b6c SHA512 ceaf745edb6876b9cc0558614718b601edfb2118a34090156fdfa3ddbbcdb3f27bb5658de587e0f95c612dca8638800352752e0616fb84cfa4e628f5b5a65549
diff --git a/games-fps/alephone-infinity/alephone-infinity-20221126.ebuild b/games-fps/alephone-infinity/alephone-infinity-20240822.ebuild
index 4c0369226bad..05045fa23f0e 100644
--- a/games-fps/alephone-infinity/alephone-infinity-20221126.ebuild
+++ b/games-fps/alephone-infinity/alephone-infinity-20240822.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/games-fps/alephone-marathon/Manifest b/games-fps/alephone-marathon/Manifest
index 8373e6e29bca..1c746993b2fd 100644
--- a/games-fps/alephone-marathon/Manifest
+++ b/games-fps/alephone-marathon/Manifest
@@ -1,3 +1,3 @@
-DIST Marathon-20221126-Data.zip 26473388 BLAKE2B 16e93da81942c77ff399364d16a9b554c9f13320f08604006dc991b0be24db69d2a6496c45053d2ebb66628f3f2024d09953cec565d6fbdf8d6380f593f47e3e SHA512 4fcf16fcf0a04ccb5ce1fc4dc0ef95a09ff9010f444438c830977490401d3ca01e10d1ffe429df804d3ed6683e8b8f5aed982ca5a3e3049a23b074c783fb7c61
-EBUILD alephone-marathon-20221126.ebuild 877 BLAKE2B 21bc4a701e1bdbc427ad68f2e1135948ca9b7d3e9a7b03b7a1443ee672b4b5277de42f7746699978866fd5fd142db52d4e600026cc8fa129b9d38ab851addb53 SHA512 a44066187deb3d870c2398bd2e4426dc5f116978b5e68ca8a697ed1dd3574901621c622a8dabc4931e76bba0052986e8dc20d8aba8715014ecd189063fd00e12
+DIST Marathon-20240822-Data.zip 26408514 BLAKE2B 81459b2bd3718fc4b87d8da512da202912847673ee912467d7aee871bede0f5163cccdf0836f39968dd6c93cff443684491189281ad90b10ae9d0a77e45a8f24 SHA512 b834b181c9451d003c1e87844faf7c56e827e48475d66ac644f4387227ec40f5199758c3a517334c10ae3938f51ecf453d40cc99ff0a95614c5888a6b5cfb196
+EBUILD alephone-marathon-20240822.ebuild 877 BLAKE2B 90b5041d95c32a9323a602c70aeb2075b21b7a2aeb3a22e368f2020d3518fd8f82cc497e9233ab5164b075f7303be09e98bea3372893d172b0d1e8fd49d9bb68 SHA512 d1bea9ef2a3deea5a7d45444448e3b85f2bc6553e416327c1a4374b183a64fe6932079d6761b53f7e4647f9363f513a93db6b95a60ee33c6089497be7bd9be1f
MISC metadata.xml 502 BLAKE2B 6137461c8262b053ace80fbacd23734a44e5292eb352be6eddddb4604030093a6df38c098cd1d9168e859f05c5f9552fd32b607dd31d5b42cf6ee285e7ca5b6c SHA512 ceaf745edb6876b9cc0558614718b601edfb2118a34090156fdfa3ddbbcdb3f27bb5658de587e0f95c612dca8638800352752e0616fb84cfa4e628f5b5a65549
diff --git a/games-fps/alephone-marathon/alephone-marathon-20221126.ebuild b/games-fps/alephone-marathon/alephone-marathon-20240822.ebuild
index 020967a4d7da..a1e8facfaa52 100644
--- a/games-fps/alephone-marathon/alephone-marathon-20221126.ebuild
+++ b/games-fps/alephone-marathon/alephone-marathon-20240822.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/games-fps/alephone/Manifest b/games-fps/alephone/Manifest
index 0fd4d94f353f..f562b9ed18ad 100644
--- a/games-fps/alephone/Manifest
+++ b/games-fps/alephone/Manifest
@@ -1,6 +1,5 @@
-AUX alephone-20230119-c99.patch 2226 BLAKE2B ce4b1164e5cbd07045ebf9c7612b943c2f052c2ce24a0629bce730154366964213b82bfe04c51d13fa46b837369f3d11da012b769bf948ccc637528e432fc663 SHA512 82a08c1d5b83681a69a97b9f054c7f70714ec607bb3b15e4dfefd09b2a8dbed9debe75a6eb090b41ad3787516f1dd6b7a5fbfeb051ca3cc7a719f49a85043774
AUX alephone.sh 486 BLAKE2B ed0a60d272e7894ec64ce6f5a727dd4cd129ae8e582f72c74d2177cf22e2be18ee72d0988204fb65650da2c0e3890c9640844bea2f8091b32d24dfb80537dd8e SHA512 4eaf345bec8daecba38125a4bceef2d20985b1653550f935af20a28ec59f8615bf14d9254257e56d006affa24d63a3859e3270f416fcfb318dc688fefa2aff3b
-DIST release-20230119.tar.gz 6968352 BLAKE2B 06bc87b4c2bc6a311ee90f854f7c35fb4da2862c417b192a4364dbd38cac9c0c02c4439abf07e6bc7c2d68899fae4dd938464896039943f1fa6ae5a4a644260f SHA512 d1ede53c20a24b74f5525e2e8c09fdbbb05fa0262bbd8f6c1abe6c3698cdfd1dea2436487ec8f64c79a7e1f150367e40ea48838f8a42031b45c0b1498a0e77d1
-EBUILD alephone-20230119.ebuild 2471 BLAKE2B 96f844c78f2a68328e282a558ad2cfc15a79a366295b28b88339a6a1e24f80ffa35a60046f2afd7ea0d2c1fcabb4417f10ad25653a140d940140dc36224baefa SHA512 45a380844ea8cadb7ee79b924ea50515a84b3fefe30e9bc5fab43bd45308fd61cfa73747e0701d2b60714ccdb99f78a31db8d3bf12dcd238a7a71ee338d96d5c
-EBUILD alephone-99999999.ebuild 2429 BLAKE2B 621f5eddbf188632c6d36356f55d6f2dacc1227ab7af1c904905e44f83beffb4da4734fca77cfccb34c6cdf905896d73f0643c754467ab76ae8f70a96029e1f4 SHA512 24d07c863dafe2a35bb3ef775db6c202dfa450a29871f0b9547f198954e64249b08168dcedf9f85d7e9b919f430899820a962d2eea11cc2985e5208a34de4a95
+DIST alephone-20240822.tar.gz 9146694 BLAKE2B 236997765085c520b90399cffba04a5edeb54810e1d0b614ded183addf7520727b6750971cdc70215e211547514209b01c7e515c4e1e7296e18c99c1a79ff958 SHA512 e00dbc4cb84c40c666554114c47f3eff59ab6fbc101d45d20ae510d9cc2ef1d75300f2554f61396939d030d1fd5ff237b512c6e34ae779523b93e206368bec3d
+EBUILD alephone-20240822.ebuild 1959 BLAKE2B d0435e25d3d627f8d4894f0a61a80c5e1d890d1a0ae06876607dff5c1d60e9291de1d1cb875586577c26c133803299aed7b327435bea12bbe8856fc62edbd5ee SHA512 3f7eec03ddb8101064d213059409d61c9cc962997db2fb153b9a5bc8714558f3d6ba770326a8ff74148861279db790c56cd81e6c86d226620d5b1eaa67ab250e
+EBUILD alephone-99999999.ebuild 1959 BLAKE2B d0435e25d3d627f8d4894f0a61a80c5e1d890d1a0ae06876607dff5c1d60e9291de1d1cb875586577c26c133803299aed7b327435bea12bbe8856fc62edbd5ee SHA512 3f7eec03ddb8101064d213059409d61c9cc962997db2fb153b9a5bc8714558f3d6ba770326a8ff74148861279db790c56cd81e6c86d226620d5b1eaa67ab250e
MISC metadata.xml 577 BLAKE2B 3e1621c41a4408ffe750626d76663afb04774542389030f87cd68b8ff8ed89e9dabb70943891860863933625c3ea2b743c178812b06817023b52feca99d3f65d SHA512 8a5ab6e53fbf8dfa41938ec2aff833133105ee900c1a52c2df8649b8f800507b0801df705f6f5201af4a23237b99c1a8996b7f67e2cb9826a31bcb730881682a
diff --git a/games-fps/alephone/alephone-20230119.ebuild b/games-fps/alephone/alephone-20240822.ebuild
index 895dc7325c50..7219486b5808 100644
--- a/games-fps/alephone/alephone-20230119.ebuild
+++ b/games-fps/alephone/alephone-20240822.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999* ]]; then
EGIT_REPO_URI="https://github.com/Aleph-One-Marathon/alephone/"
EGIT_SUBMODULES=() # Upstream includes game data as submodules, we only want the engine
else
- SRC_URI="https://github.com/Aleph-One-Marathon/alephone/archive/refs/tags/release-${PV}.tar.gz"
+ SRC_URI="https://github.com/Aleph-One-Marathon/alephone/archive/refs/tags/release-${PV}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/${PN}-release-${PV}"
KEYWORDS="~amd64"
fi
@@ -20,19 +20,15 @@ fi
LICENSE="GPL-3+ BitstreamVera OFL-1.1"
SLOT="0"
-IUSE="alsa curl speex upnp"
+IUSE="curl upnp"
-# ffmpeg covers most audio/video use cases and the package doesn't configure
-# with alternatives enabled (media-libs/smpeg)
-# When resolved upstream,
-# !ffmpeg ( media-libs/libmad media-libs/libsndfile media-libs/libvorbis media-libs/smpeg )
-# with an appropriate REQUIRED_USE may be added.
-# See https://github.com/Aleph-One-Marathon/alephone/issues/85
RDEPEND="
dev-libs/boost:=
dev-libs/zziplib:=
+ media-libs/openal
media-libs/libpng
media-libs/libsdl2
+ media-libs/libsndfile
media-libs/sdl2-image[png]
media-libs/sdl2-net
media-libs/sdl2-ttf
@@ -40,12 +36,7 @@ RDEPEND="
sys-libs/zlib
virtual/opengl
virtual/glu
- alsa? ( media-libs/alsa-lib )
curl? ( net-misc/curl )
- speex? (
- media-libs/speex
- media-libs/speexdsp
- )
upnp? ( net-libs/miniupnpc )
"
@@ -57,31 +48,25 @@ BDEPEND="
virtual/pkgconfig
"
-PATCHES=( "${FILESDIR}/${P}-c99.patch" )
-
src_prepare() {
default
eautoreconf
}
src_configure() {
- # -Werror=odr
- # https://bugs.gentoo.org/873298
- # https://github.com/Aleph-One-Marathon/alephone/issues/475
+ # With LTO enabled enemies are not visible
+ # https://github.com/Aleph-One-Marathon/alephone/issues/518
filter-lto
-
- econf \
- --enable-lua \
- --enable-opengl \
- --with-ffmpeg \
- --without-mad \
- --without-smpeg \
- --without-sndfile \
- --without-vorbis \
- $(use_with alsa) \
- $(use_with curl) \
- $(use_with speex) \
+ my_econf=(
+ --enable-opengl
+ --with-ffmpeg
+ --with-png
+ --with-sdl_image
+ --with-zzip
+ $(use_with curl)
$(use_with upnp miniupnpc)
+ )
+ econf "${my_econf[@]}"
}
src_compile() {
diff --git a/games-fps/alephone/alephone-99999999.ebuild b/games-fps/alephone/alephone-99999999.ebuild
index 9a32dc2729ec..7219486b5808 100644
--- a/games-fps/alephone/alephone-99999999.ebuild
+++ b/games-fps/alephone/alephone-99999999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999* ]]; then
EGIT_REPO_URI="https://github.com/Aleph-One-Marathon/alephone/"
EGIT_SUBMODULES=() # Upstream includes game data as submodules, we only want the engine
else
- SRC_URI="https://github.com/Aleph-One-Marathon/alephone/archive/refs/tags/release-${PV}.tar.gz"
+ SRC_URI="https://github.com/Aleph-One-Marathon/alephone/archive/refs/tags/release-${PV}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/${PN}-release-${PV}"
KEYWORDS="~amd64"
fi
@@ -20,19 +20,15 @@ fi
LICENSE="GPL-3+ BitstreamVera OFL-1.1"
SLOT="0"
-IUSE="alsa curl speex upnp"
+IUSE="curl upnp"
-# ffmpeg covers most audio/video use cases and the package doesn't configure
-# with alternatives enabled (media-libs/smpeg)
-# When resolved upstream,
-# !ffmpeg ( media-libs/libmad media-libs/libsndfile media-libs/libvorbis media-libs/smpeg )
-# with an appropriate REQUIRED_USE may be added.
-# See https://github.com/Aleph-One-Marathon/alephone/issues/85
RDEPEND="
dev-libs/boost:=
dev-libs/zziplib:=
+ media-libs/openal
media-libs/libpng
media-libs/libsdl2
+ media-libs/libsndfile
media-libs/sdl2-image[png]
media-libs/sdl2-net
media-libs/sdl2-ttf
@@ -40,12 +36,7 @@ RDEPEND="
sys-libs/zlib
virtual/opengl
virtual/glu
- alsa? ( media-libs/alsa-lib )
curl? ( net-misc/curl )
- speex? (
- media-libs/speex
- media-libs/speexdsp
- )
upnp? ( net-libs/miniupnpc )
"
@@ -63,23 +54,19 @@ src_prepare() {
}
src_configure() {
- # -Werror=odr
- # https://bugs.gentoo.org/873298
- # https://github.com/Aleph-One-Marathon/alephone/issues/475
+ # With LTO enabled enemies are not visible
+ # https://github.com/Aleph-One-Marathon/alephone/issues/518
filter-lto
-
- econf \
- --enable-lua \
- --enable-opengl \
- --with-ffmpeg \
- --without-mad \
- --without-smpeg \
- --without-sndfile \
- --without-vorbis \
- $(use_with alsa) \
- $(use_with curl) \
- $(use_with speex) \
+ my_econf=(
+ --enable-opengl
+ --with-ffmpeg
+ --with-png
+ --with-sdl_image
+ --with-zzip
+ $(use_with curl)
$(use_with upnp miniupnpc)
+ )
+ econf "${my_econf[@]}"
}
src_compile() {
diff --git a/games-fps/alephone/files/alephone-20230119-c99.patch b/games-fps/alephone/files/alephone-20230119-c99.patch
deleted file mode 100644
index 7340e1fb2be0..000000000000
--- a/games-fps/alephone/files/alephone-20230119-c99.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-https://github.com/Aleph-One-Marathon/alephone/pull/405
-From: Matt Jolly <Matt.Jolly@footclan.ninja>
-Date: Sat, 28 Jan 2023 18:03:51 +1100
-Subject: [PATCH] use designated initialisers for SDL_ffmpegCodec*
-
-These were failing to compile under clang16 as the old `audioBitrate`
-was being jammed into `crf`, causing an incompatible integer conversion.
---- a/Source_Files/FFmpeg/SDL_ffmpeg.c
-+++ b/Source_Files/FFmpeg/SDL_ffmpeg.c
-@@ -155,41 +155,55 @@ int SDL_ffmpegDecodeVideoFrame( SDL_ffmpegFile*, AVPacket*, SDL_ffmpegVideoFrame
-
- const SDL_ffmpegCodec SDL_ffmpegCodecAUTO =
- {
-- -1,
-- 720, 576,
-- 1, 25,
-- 6000000,
-- -1, -1,
-- -1,
-- 2, 48000,
-- 192000,
-- -1, -1
-+ .videoCodecID=-1,
-+ .width=720,
-+ .height=576,
-+ .framerateNum=1,
-+ .framerateDen=25,
-+ .videoBitrate=6000000,
-+ .videoMinRate=-1,
-+ .videoMaxRate=-1,
-+ .audioCodecID=-1,
-+ .channels=2,
-+ .sampleRate=48000,
-+ .cpuCount=-1,
-+ .audioQuality=-1
- };
-
-+
-+
- const SDL_ffmpegCodec SDL_ffmpegCodecPALDVD =
- {
-- AV_CODEC_ID_MPEG2VIDEO,
-- 720, 576,
-- 1, 25,
-- 6000000,
-- -1, -1,
-- AV_CODEC_ID_MP2,
-- 2, 48000,
-- 192000,
-- -1, -1
-+ .videoCodecID=AV_CODEC_ID_MPEG2VIDEO,
-+ .width=720,
-+ .height=576,
-+ .framerateNum=1,
-+ .framerateDen=25,
-+ .videoBitrate=6000000,
-+ .videoMinRate=-1,
-+ .videoMaxRate=-1,
-+ .audioCodecID=AV_CODEC_ID_MP2,
-+ .channels=2,
-+ .sampleRate=48000,
-+ .cpuCount=-1,
-+ .audioQuality=-1
- };
-
- const SDL_ffmpegCodec SDL_ffmpegCodecPALDV =
- {
-- AV_CODEC_ID_DVVIDEO,
-- 720, 576,
-- 1, 25,
-- 6553600,
-- -1, -1,
-- AV_CODEC_ID_DVAUDIO,
-- 2, 48000,
-- 256000,
-- -1, -1
-+ .videoCodecID=AV_CODEC_ID_DVVIDEO,
-+ .width=720,
-+ .height=576,
-+ .framerateNum=1,
-+ .framerateDen=25,
-+ .videoBitrate=6553600,
-+ .videoMinRate=-1,
-+ .videoMaxRate=-1,
-+ .audioCodecID=AV_CODEC_ID_DVAUDIO,
-+ .channels=2,
-+ .sampleRate=48000,
-+ .cpuCount=-1,
-+ .audioQuality=-1
- };
-
- SDL_ffmpegFile* SDL_ffmpegCreateFile()
-@@ -2269,4 +2283,4 @@ int SDL_ffmpegDecodeVideoFrame( SDL_ffmpegFile* file, AVPacket *pack, SDL_ffmpeg
- /**
- \endcond
- */
--#endif
-\ No newline at end of file
-+#endif