Bug#641701: A patch for ffaudio with audacious 3.2
On 01/28/2012 10:32 PM, Cyril Lavier wrote:
On 01/28/2012 07:51 PM, Reinhard Tartler wrote:
On Sa, Jan 28, 2012 at 18:41:06 (CET), Cyril Lavier wrote:
[...]
Hi.
I didn't choose anything, I just took the patch which Andrei did, just
rewrote it and applied it to the sources. But I agree with your
comment,
as I don't know why he chose those particular version.
I see. Can you ask him to clarify? I guess that clarification is best
documented by a source-code comment.
I just asked him, let's wait until he answers.
I will work on reducing these requirements for easing the making of a
squeeze-backport (as I'm the backporter, I won't have to work twice on
the patch).
Since libav 0.7 (and soon 0.8) is available in squeeze-backports, I
wouldn't spend too much time on that. Just build against libav in
squeeze-backports and be done with that.
You are right.
I just made a quick build of audacious and audacious-plugins on a
squeeze-backports pbuilder, and the only issues I had are with others
libs (libbs2b-dev for audacious-plugins, libguess-dev and
libuchardet-dev for audacious which are not available in stable). The
build went well.
I just tested the packages on a Squeeze laptop, and he plays wma files
like a charm, so it confirms the well done build :).
I completely understand that upgrading the needed libs is quite risky
and won't be done in the next days/weeks without risking to break
a lot
of packages.
What libraries would require updates? Currently, we do ship up-to-date
packages.
Sorry, I completely messed this paragraph, I was writing 2 mails at the
same time and my colleagues might think I'm crazy now, after talking
about audacious in a corporate mail about an off-hours product update
which turned bad :/.
no problem :-)
So I would like to know what do you think about this patch, if
this can
be a good solution, and then I will perform the needed changes and
push
it to the git repo or if you think it's not a good solution, we won't
have the plugin working for now.
The configure part can be dropped if you run the autofoo toolchain on
the buildds (cf. dh-autoreconf or similar).
Thanks for this idea.
The ffaudio-core part looks reasonable to me on the first sight. It
could probably simplified a bit by requiring libav{codec,format}= 53
Cheers,
Reinhard
Thanks for this quick review.
I will focus on making this patch working for debian squeeze and more
testing with this patch activated.
see above wrt squeeze-backports.
Cheers,
Reinhard
Thanks.
Hi Reinhard.
I got the answer right here :
http://redmine.audacious-media-player.org/boards/1/topics/89?r=121#message-121
So apparently, the versions choosed were the last specified before they
increased version requirements.
Also, John Lindgren explains why the libavcodec 52.64.0 is required (an
API change in FFMPEG).
Sorry for the late answer, I had a busy week working on nginx packaging
(fixing the last goals for the wheezy freeze, and starting to make
people work as a team).
Thanks.
--
Cyril Davromaniak Lavier
KeyID 59E9A881
http://www.davromaniak.eu
___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Bug#641701: A patch for ffaudio with audacious 3.2
I got the answer right here : http://redmine.audacious-media-player.org/boards/1/topics/89?r=121#message-121 Makes sense to me. thanks! -- regards, Reinhard ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Bug#641701: A patch for ffaudio with audacious 3.2
Hi.
On the audacious forum, Andrei Alin proposed a patch for this.
I tried to include it in the audacious-plugins source package (I rewrote
it, using autoconf for regenerate the configure file). It builds fine
and the ffaudio plugin is enabled again (not enabled in the 3.2-1).
I don't know if I will include it in the next upload (I don't even know
if I will push it in the GIT repo), as it's a quite big patch. But
audacious developers are not going to make the plugin compatible with
older versions of ffmpeg.
I completely understand that upgrading the needed libs is quite risky
and won't be done in the next days/weeks without risking to break a lot
of packages.
So I would like to know what do you think about this patch, if this can
be a good solution, and then I will perform the needed changes and push
it to the git repo or if you think it's not a good solution, we won't
have the plugin working for now.
Thanks.
--
Cyril Davromaniak Lavier
Description: Make audacious work with current unstable version of FFAUDIO
Author: Andrei Alin and...@webupd8.org
Last-Update: 2012-01-28
--- a/configure.ac
+++ b/configure.ac
@@ -549,7 +549,7 @@
if test $enable_ffaudio = yes ; then
PKG_CHECK_MODULES([FFMPEG],
- [libavcodec = 53.40.0 libavformat = 53.5.0 libavutil = 50.42.0],
+ [libavcodec = 52.64.0 libavformat = 52.110.0 libavutil = 50.42.0],
[have_ffaudio=yes], [have_ffaudio=no])
fi
--- a/configure
+++ b/configure
@@ -10914,12 +10914,12 @@
pkg_cv_FFMPEG_CFLAGS=$FFMPEG_CFLAGS
elif test -n $PKG_CONFIG; then
if test -n $PKG_CONFIG \
-{ { $as_echo $as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \libavcodec = 53.40.0 libavformat = 53.5.0 libavutil = 50.42.0\; } 5
- ($PKG_CONFIG --exists --print-errors libavcodec = 53.40.0 libavformat = 53.5.0 libavutil = 50.42.0) 25
+{ { $as_echo $as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \libavcodec = 52.64.0 libavformat = 52.110.0 libavutil = 50.42.0\; } 5
+ ($PKG_CONFIG --exists --print-errors libavcodec = 52.64.0 libavformat = 52.110.0 libavutil = 50.42.0) 25
ac_status=$?
$as_echo $as_me:${as_lineno-$LINENO}: \$? = $ac_status 5
test $ac_status = 0; }; then
- pkg_cv_FFMPEG_CFLAGS=`$PKG_CONFIG --cflags libavcodec = 53.40.0 libavformat = 53.5.0 libavutil = 50.42.0 2/dev/null`
+ pkg_cv_FFMPEG_CFLAGS=`$PKG_CONFIG --cflags libavcodec = 52.64.0 libavformat = 52.110.0 libavutil = 50.42.0 2/dev/null`
test x$? != x0 pkg_failed=yes
else
pkg_failed=yes
@@ -10931,12 +10931,12 @@
pkg_cv_FFMPEG_LIBS=$FFMPEG_LIBS
elif test -n $PKG_CONFIG; then
if test -n $PKG_CONFIG \
-{ { $as_echo $as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \libavcodec = 53.40.0 libavformat = 53.5.0 libavutil = 50.42.0\; } 5
- ($PKG_CONFIG --exists --print-errors libavcodec = 53.40.0 libavformat = 53.5.0 libavutil = 50.42.0) 25
+{ { $as_echo $as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \libavcodec = 52.64.0 libavformat = 52.110.0 libavutil = 50.42.0\; } 5
+ ($PKG_CONFIG --exists --print-errors libavcodec = 52.64.0 libavformat = 52.110.0 libavutil = 50.42.0) 25
ac_status=$?
$as_echo $as_me:${as_lineno-$LINENO}: \$? = $ac_status 5
test $ac_status = 0; }; then
- pkg_cv_FFMPEG_LIBS=`$PKG_CONFIG --libs libavcodec = 53.40.0 libavformat = 53.5.0 libavutil = 50.42.0 2/dev/null`
+ pkg_cv_FFMPEG_LIBS=`$PKG_CONFIG --libs libavcodec = 52.64.0 libavformat = 52.110.0 libavutil = 50.42.0 2/dev/null`
test x$? != x0 pkg_failed=yes
else
pkg_failed=yes
@@ -10957,9 +10957,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- FFMPEG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs libavcodec = 53.40.0 libavformat = 53.5.0 libavutil = 50.42.0 21`
+ FFMPEG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs libavcodec = 52.64.0 libavformat = 52.110.0 libavutil = 50.42.0 21`
else
- FFMPEG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs libavcodec = 53.40.0 libavformat = 53.5.0 libavutil = 50.42.0 21`
+ FFMPEG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs libavcodec = 52.64.0 libavformat = 52.110.0 libavutil = 50.42.0 21`
fi
# Put the nasty error message in config.log where it belongs
echo $FFMPEG_PKG_ERRORS 5
--- a/src/ffaudio/ffaudio-core.c
+++ b/src/ffaudio/ffaudio-core.c
@@ -40,6 +40,14 @@
#endif
#include libaudcore/audstrings.h
+#if ! CHECK_LIBAVFORMAT_VERSION (53, 5, 0)
+#define avformat_find_stream_info(i, o) av_find_stream_info (i)
+#endif
+
+#if ! CHECK_LIBAVCODEC_VERSION (53, 8, 0)
+#define avcodec_open2(a, c, o) avcodec_open (a, c)
+#endif
+
static GMutex *ctrl_mutex = NULL;
static GCond *ctrl_cond = NULL;
static gint64 seek_value = -1;
@@ -423,8 +431,11 @@
AVCodecContext *c = NULL;
AVStream *s = NULL;
AVPacket pkt = {.data = NULL};
+guint8
Bug#641701: A patch for ffaudio with audacious 3.2
On Sa, Jan 28, 2012 at 11:46:46 (CET), Cyril Lavier wrote:
Hi.
On the audacious forum, Andrei Alin proposed a patch for this.
I tried to include it in the audacious-plugins source package (I rewrote
it, using autoconf for regenerate the configure file). It builds fine
and the ffaudio plugin is enabled again (not enabled in the 3.2-1).
I don't know if I will include it in the next upload (I don't even know
if I will push it in the GIT repo), as it's a quite big patch. But
audacious developers are not going to make the plugin compatible with
older versions of ffmpeg.
Well, the patch *reduces* the requirements on libavformat and libavcodec
considerably (libavcodec53 - libavcodec52, and libavformat53 -
libavformat52:
--- a/configure.ac
+++ b/configure.ac
@@ -549,7 +549,7 @@
if test $enable_ffaudio = yes ; then
PKG_CHECK_MODULES([FFMPEG],
- [libavcodec = 53.40.0 libavformat = 53.5.0 libavutil = 50.42.0],
+ [libavcodec = 52.64.0 libavformat = 52.110.0 libavutil = 50.42.0],
[have_ffaudio=yes], [have_ffaudio=no])
fi
Note that these requirements do not suffice for squeeze, which ships
libavformat with these library version numbers:
24 #define LIBAVFORMAT_VERSION_MAJOR 52
25 #define LIBAVFORMAT_VERSION_MINOR 31
26 #define LIBAVFORMAT_VERSION_MICRO 0
and libavcodec with:
32 #define LIBAVCODEC_VERSION_MAJOR 52
33 #define LIBAVCODEC_VERSION_MINOR 20
34 #define LIBAVCODEC_VERSION_MICRO 1
I therefore wonder why you've chosen those particular version
requirements, since there is an updated libav package set in
squeeze-backports.
I completely understand that upgrading the needed libs is quite risky
and won't be done in the next days/weeks without risking to break a lot
of packages.
What libraries would require updates? Currently, we do ship up-to-date
packages.
So I would like to know what do you think about this patch, if this can
be a good solution, and then I will perform the needed changes and push
it to the git repo or if you think it's not a good solution, we won't
have the plugin working for now.
The configure part can be dropped if you run the autofoo toolchain on
the buildds (cf. dh-autoreconf or similar).
The ffaudio-core part looks reasonable to me on the first sight. It
could probably simplified a bit by requiring libav{codec,format} = 53
Cheers,
Reinhard
--
Gruesse/greetings,
Reinhard Tartler, KeyID 945348A4
___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Bug#641701: A patch for ffaudio with audacious 3.2
On 01/28/2012 05:26 PM, Reinhard Tartler wrote:
On Sa, Jan 28, 2012 at 11:46:46 (CET), Cyril Lavier wrote:
Hi.
On the audacious forum, Andrei Alin proposed a patch for this.
I tried to include it in the audacious-plugins source package (I rewrote
it, using autoconf for regenerate the configure file). It builds fine
and the ffaudio plugin is enabled again (not enabled in the 3.2-1).
I don't know if I will include it in the next upload (I don't even know
if I will push it in the GIT repo), as it's a quite big patch. But
audacious developers are not going to make the plugin compatible with
older versions of ffmpeg.
Well, the patch *reduces* the requirements on libavformat and libavcodec
considerably (libavcodec53 - libavcodec52, and libavformat53 -
libavformat52:
--- a/configure.ac
+++ b/configure.ac
@@ -549,7 +549,7 @@
if test $enable_ffaudio = yes ; then
PKG_CHECK_MODULES([FFMPEG],
- [libavcodec= 53.40.0 libavformat= 53.5.0 libavutil= 50.42.0],
+ [libavcodec= 52.64.0 libavformat= 52.110.0 libavutil= 50.42.0],
[have_ffaudio=yes], [have_ffaudio=no])
fi
Note that these requirements do not suffice for squeeze, which ships
libavformat with these library version numbers:
24 #define LIBAVFORMAT_VERSION_MAJOR 52
25 #define LIBAVFORMAT_VERSION_MINOR 31
26 #define LIBAVFORMAT_VERSION_MICRO 0
and libavcodec with:
32 #define LIBAVCODEC_VERSION_MAJOR 52
33 #define LIBAVCODEC_VERSION_MINOR 20
34 #define LIBAVCODEC_VERSION_MICRO 1
I therefore wonder why you've chosen those particular version
requirements, since there is an updated libav package set in
squeeze-backports.
Hi.
I didn't choose anything, I just took the patch which Andrei did, just
rewrote it and applied it to the sources. But I agree with your comment,
as I don't know why he chose those particular version.
I will work on reducing these requirements for easing the making of a
squeeze-backport (as I'm the backporter, I won't have to work twice on
the patch).
I completely understand that upgrading the needed libs is quite risky
and won't be done in the next days/weeks without risking to break a lot
of packages.
What libraries would require updates? Currently, we do ship up-to-date
packages.
Sorry, I completely messed this paragraph, I was writing 2 mails at the
same time and my colleagues might think I'm crazy now, after talking
about audacious in a corporate mail about an off-hours product update
which turned bad :/.
So I would like to know what do you think about this patch, if this can
be a good solution, and then I will perform the needed changes and push
it to the git repo or if you think it's not a good solution, we won't
have the plugin working for now.
The configure part can be dropped if you run the autofoo toolchain on
the buildds (cf. dh-autoreconf or similar).
Thanks for this idea.
The ffaudio-core part looks reasonable to me on the first sight. It
could probably simplified a bit by requiring libav{codec,format}= 53
Cheers,
Reinhard
Thanks for this quick review.
I will focus on making this patch working for debian squeeze and more
testing with this patch activated.
Thanks
--
Cyril Davromaniak Lavier
___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Bug#641701: A patch for ffaudio with audacious 3.2
On Sa, Jan 28, 2012 at 18:41:06 (CET), Cyril Lavier wrote:
[...]
Hi.
I didn't choose anything, I just took the patch which Andrei did, just
rewrote it and applied it to the sources. But I agree with your comment,
as I don't know why he chose those particular version.
I see. Can you ask him to clarify? I guess that clarification is best
documented by a source-code comment.
I will work on reducing these requirements for easing the making of a
squeeze-backport (as I'm the backporter, I won't have to work twice on
the patch).
Since libav 0.7 (and soon 0.8) is available in squeeze-backports, I
wouldn't spend too much time on that. Just build against libav in
squeeze-backports and be done with that.
I completely understand that upgrading the needed libs is quite risky
and won't be done in the next days/weeks without risking to break a lot
of packages.
What libraries would require updates? Currently, we do ship up-to-date
packages.
Sorry, I completely messed this paragraph, I was writing 2 mails at the
same time and my colleagues might think I'm crazy now, after talking
about audacious in a corporate mail about an off-hours product update
which turned bad :/.
no problem :-)
So I would like to know what do you think about this patch, if this can
be a good solution, and then I will perform the needed changes and push
it to the git repo or if you think it's not a good solution, we won't
have the plugin working for now.
The configure part can be dropped if you run the autofoo toolchain on
the buildds (cf. dh-autoreconf or similar).
Thanks for this idea.
The ffaudio-core part looks reasonable to me on the first sight. It
could probably simplified a bit by requiring libav{codec,format}= 53
Cheers,
Reinhard
Thanks for this quick review.
I will focus on making this patch working for debian squeeze and more
testing with this patch activated.
see above wrt squeeze-backports.
Cheers,
Reinhard
--
Gruesse/greetings,
Reinhard Tartler, KeyID 945348A4
___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Bug#641701: A patch for ffaudio with audacious 3.2
On 01/28/2012 07:51 PM, Reinhard Tartler wrote:
On Sa, Jan 28, 2012 at 18:41:06 (CET), Cyril Lavier wrote:
[...]
Hi.
I didn't choose anything, I just took the patch which Andrei did, just
rewrote it and applied it to the sources. But I agree with your comment,
as I don't know why he chose those particular version.
I see. Can you ask him to clarify? I guess that clarification is best
documented by a source-code comment.
I just asked him, let's wait until he answers.
I will work on reducing these requirements for easing the making of a
squeeze-backport (as I'm the backporter, I won't have to work twice on
the patch).
Since libav 0.7 (and soon 0.8) is available in squeeze-backports, I
wouldn't spend too much time on that. Just build against libav in
squeeze-backports and be done with that.
You are right.
I just made a quick build of audacious and audacious-plugins on a
squeeze-backports pbuilder, and the only issues I had are with others
libs (libbs2b-dev for audacious-plugins, libguess-dev and
libuchardet-dev for audacious which are not available in stable). The
build went well.
I just tested the packages on a Squeeze laptop, and he plays wma files
like a charm, so it confirms the well done build :).
I completely understand that upgrading the needed libs is quite risky
and won't be done in the next days/weeks without risking to break a lot
of packages.
What libraries would require updates? Currently, we do ship up-to-date
packages.
Sorry, I completely messed this paragraph, I was writing 2 mails at the
same time and my colleagues might think I'm crazy now, after talking
about audacious in a corporate mail about an off-hours product update
which turned bad :/.
no problem :-)
So I would like to know what do you think about this patch, if this can
be a good solution, and then I will perform the needed changes and push
it to the git repo or if you think it's not a good solution, we won't
have the plugin working for now.
The configure part can be dropped if you run the autofoo toolchain on
the buildds (cf. dh-autoreconf or similar).
Thanks for this idea.
The ffaudio-core part looks reasonable to me on the first sight. It
could probably simplified a bit by requiring libav{codec,format}= 53
Cheers,
Reinhard
Thanks for this quick review.
I will focus on making this patch working for debian squeeze and more
testing with this patch activated.
see above wrt squeeze-backports.
Cheers,
Reinhard
Thanks.
--
Cyril Davromaniak Lavier
___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
