Re: [SCM] handbrake packaging branch, master, created. de1f9ddeef0932713c9d436d3ce28db14ebe9b39
Hi there.
On May 13 2012, Fabian Greffrath wrote:
Am Samstag, den 12.05.2012, 11:29 -0400 schrieb Andres Mejia:
I just glanced over the changes to this. To be on the safer side, the
symbols needed by handbrake and provided in audioconvert.c should be
built from handbrake. This way, any internal changes made to libav for
audioconvert won't break handbrake.
IIRC, the only symbol from audioconvert.h that was actually needed was
struct AVAudioConvert, so I declared that myself and was ready with it.
Please compare with my patch from
http://lists.alioth.debian.org/pipermail/pkg-multimedia-maintainers/2012-February/024218.html:
Sorry for not replying earlier, but I didn't receive these messages of yours
(I'm subscribed to the list with an account that I don't check as frequently
as my main e-mail).
Regarding Fabian's patch, I will steal it and substitute the kludgy solution
that I used.
Perhaps it would be sane to forward this to the handbrake people? Their code
is of very heterogeneous quality: some parts are good, but some are bad.
Thanks,
--
Rogério Brito : rbrito@{ime.usp.br,gmail.com} : GPG key 4096R/BCFC
http://rb.doesntexist.org/blog : Projects : https://github.com/rbrito/
DebianQA: http://qa.debian.org/developer.php?login=rbrito%40ime.usp.br
___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Re: [SCM] handbrake packaging branch, master, created. de1f9ddeef0932713c9d436d3ce28db14ebe9b39
Am Samstag, den 12.05.2012, 11:29 -0400 schrieb Andres Mejia: I just glanced over the changes to this. To be on the safer side, the symbols needed by handbrake and provided in audioconvert.c should be built from handbrake. This way, any internal changes made to libav for audioconvert won't break handbrake. IIRC, the only symbol from audioconvert.h that was actually needed was struct AVAudioConvert, so I declared that myself and was ready with it. Please compare with my patch from http://lists.alioth.debian.org/pipermail/pkg-multimedia-maintainers/2012-February/024218.html: --- handbrake-0.9.5.orig/libhb/decavcodec.c +++ handbrake-0.9.5/libhb/decavcodec.c @@ -62,7 +62,9 @@ #include hb.h #include hbffmpeg.h #include downmix.h -#include libavcodec/audioconvert.h +//#include libavcodec/audioconvert.h +struct AVAudioConvert; +typedef struct AVAudioConvert AVAudioConvert; static int decavcodecInit( hb_work_object_t *, hb_job_t * ); static int decavcodecWork( hb_work_object_t *, hb_buffer_t **, hb_buffer_t ** ); ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Re: [SCM] handbrake packaging branch, master, created. de1f9ddeef0932713c9d436d3ce28db14ebe9b39
On Sun, May 13, 2012 at 5:27 PM, Fabian Greffrath fab...@greffrath.com wrote: Am Samstag, den 12.05.2012, 11:29 -0400 schrieb Andres Mejia: I just glanced over the changes to this. To be on the safer side, the symbols needed by handbrake and provided in audioconvert.c should be built from handbrake. This way, any internal changes made to libav for audioconvert won't break handbrake. IIRC, the only symbol from audioconvert.h that was actually needed was struct AVAudioConvert, so I declared that myself and was ready with it. Please compare with my patch from http://lists.alioth.debian.org/pipermail/pkg-multimedia-maintainers/2012-February/024218.html: --- handbrake-0.9.5.orig/libhb/decavcodec.c +++ handbrake-0.9.5/libhb/decavcodec.c @@ -62,7 +62,9 @@ #include hb.h #include hbffmpeg.h #include downmix.h -#include libavcodec/audioconvert.h +//#include libavcodec/audioconvert.h +struct AVAudioConvert; +typedef struct AVAudioConvert AVAudioConvert; static int decavcodecInit( hb_work_object_t *, hb_job_t * ); static int decavcodecWork( hb_work_object_t *, hb_buffer_t **, hb_buffer_t ** ); I prefer this patch. It's better than including all of audioconvert.h. Would you mind modifying handbrake packaging to use this patch instead? -- ~ Andres ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Re: [SCM] handbrake packaging branch, master, created. de1f9ddeef0932713c9d436d3ce28db14ebe9b39
On Sat, May 12, 2012 at 4:58 AM, rbrito-gu...@users.alioth.debian.org wrote:
The branch, master has been created
at de1f9ddeef0932713c9d436d3ce28db14ebe9b39 (commit)
- Shortlog
commit de1f9ddeef0932713c9d436d3ce28db14ebe9b39
Author: Rogério Brito rbr...@ime.usp.br
Date: Sat May 12 05:43:47 2012 -0300
LinGUI: Allow user to pass libavcodec settings also with MPEG4 video.
In the present, if the user chooses the video codec to be MPEG2, then he
can
pass advanced options to libavcodec, but no advanced options are possible
if MPEG4 is selected.
This patch fixes it.
I sent a pull request to [the HandBrake maintainers' github account][0] and
[they applied it][1], but have not given me credit for it. :(
[0]: https://github.com/HandBrake/HandBrake/pull/9
[1]:
https://github.com/HandBrake/HandBrake/commit/6bfa70d2543a5defd582236d7ecc2e38d2675bdf
Signed-off-by: Rogério Brito rbr...@ime.usp.br
commit 046c3c7ba79f5c6c6e83ab7a386defec1a10c570
Author: Rogério Brito rbr...@ime.usp.br
Date: Sat May 12 05:41:14 2012 -0300
Update the changelog.
Git-Dch: Ignore
commit 8500dce1b63f3b53e539fbd7f26acef4fb8b984b
Author: Rogério Brito rbr...@ime.usp.br
Date: Sat May 12 05:34:21 2012 -0300
Force handbrake to link against the system's libav.
Note that here we use a very dirty hack, namely, taking the file
`audioconvert.h` from libav's git tree (which I was told is not a public
interface), and putting it `libhb` directory.
We also pass the `/usr/include/libavcodec` directory as an include dir for
the other headers of libav to be found.
I just glanced over the changes to this. To be on the safer side, the
symbols needed by handbrake and provided in audioconvert.c should be
built from handbrake. This way, any internal changes made to libav for
audioconvert won't break handbrake.
Of course, it's better to switch to libavresample for this than to use
this hack.
commit af05fe0f71041ab4bd5959c89df0943e3c2e9057
Author: Rogério Brito rbr...@ime.usp.br
Date: Sat May 12 04:28:16 2012 -0300
debian/patches: Remove patching of ffmpeg on kFreeBSD.
The rest of the patch should be forwarded upstream, if it is not yet in
their tree.
commit 8811efedad28e25e74ea93e3ae74941f7e26e539
Author: Rogério Brito rbr...@ime.usp.br
Date: Sat May 12 04:24:55 2012 -0300
debian/patches: Don't bother with PowerPC compilation of mpeg2dec.
We are not building `mpeg2dec` and, if necessary, the other parts of the
patch can be appropriately forwarded to the packager or upstream.
Note that it may be possible to work around the necessity of mpeg2dec by
passing the option `--enable-ff-mpeg2` to the main configure script.
I have not yet investigated this possibility.
commit 47a05ab838d06447fb33d88457cbf1fd1bca1eb3
Author: Rogério Brito rbr...@ime.usp.br
Date: Sat May 12 04:21:43 2012 -0300
debian/patches: Remove part to set compiler for ffmpeg.
There's no need for patching this further, as we don't use ffmpeg.
commit 651649036e56df6cc946186a45367d952fa0ea58
Author: Rogério Brito rbr...@ime.usp.br
Date: Sat May 12 04:18:23 2012 -0300
debian/patches: Disable 04_format-security.diff from being applied.
We are not compiling ffmpeg here, and this should be taken care of in
Debian's libav package instead, if needed.
commit da0a3c9fd9ba4455d508e46bbafbecb135007347
Author: Rogério Brito rbr...@ime.usp.br
Date: Sat May 12 04:10:24 2012 -0300
debian/control: Add Reinhard Tartler to Uploaders.
commit 36947cc69e22f196eab6a1c7d2890ba036ad4d71
Author: Rogério Brito rbr...@ime.usp.br
Date: Sat May 12 03:58:17 2012 -0300
debian/rules: Install upstream's changelog.
commit 15b0baaf4c3ad71c1f7a9ea0b2df39e51dc34aab
Author: Rogério Brito rbr...@ime.usp.br
Date: Sat May 12 03:49:56 2012 -0300
debian/patches: Remove encoding indication from desktop file.
commit 671ba17089e281b402aa5c8094b616ae1844e464
Author: Rogério Brito rbr...@ime.usp.br
Date: Sat May 12 03:47:05 2012 -0300
Update the changelog.
Git-Dch: Ignore
commit 04a0696f79b9ad0ceb622d08518a71f48b811a54
Author: Rogério Brito rbr...@ime.usp.br
Date: Sat May 12 03:44:57 2012 -0300
debian/control: Change maintainer and add me as uploader.
commit 7159973e64358087cc67e4c8ff9b15a7e796b9ec
Author: Rogério Brito rbr...@ime.usp.br
Date: Sat May 12 03:43:36 2012 -0300
debian/control: Remove libdvd{read,nav}-dev from build deps for the moment.
commit 69a9980a773b4ac6ada70c0d7408e81768b339c7
Author: Rogério Brito rbr...@ime.usp.br
Date: Sat May 12 03:09:53 2012 -0300
Refresh debian/patches/01_build.diff
commit bd52d6cd9afdbbe4d8e2b4ce2777889ab82dcfaa
Author: Rogério Brito rbr...@ime.usp.br
Date: Sat May 12 02:56:02 2012 -0300
debian/control: One fewer external library/package: mpeg2.
Drop
