Skip to content

Commit

Permalink
Merge pull request #158 from mariux64/update-ffmpeg
Browse files Browse the repository at this point in the history
pmenzel committed Nov 22, 2016
2 parents 247360a + a6f4e1b commit 734126b
Showing 9 changed files with 172 additions and 129 deletions.
2 changes: 1 addition & 1 deletion alsa-plugins.be0
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env beesh

# BEE_VERSION alsa-plugins-1.1.1-0
# BEE_VERSION alsa-plugins-1.1.1-1

## this file was created by bee init and should be executed to build a
## bee-package. (Additional hints are located at the end of this file.)
81 changes: 51 additions & 30 deletions ffmpeg.be0
Original file line number Diff line number Diff line change
@@ -1,43 +1,64 @@
#!/bin/env beesh
#!/usr/bin/env beesh

# BEE_VERSION ffmpeg-2.8.5-2
# BEE_VERSION ffmpeg-3.1.4-0

SRCURL[0]="http://ffmpeg.org/releases/ffmpeg-${PKGVERSION}.tar.bz2"
SRCURL[0]="https://ffmpeg.org/releases/ffmpeg-${PKGVERSION}.tar.bz2"

# BEE_BUILDTYPE=autotools

PATCHURL[0]=""
# PATCHURL+=()

# BEE_CONFIGURE=compat
# EXCLUDE+=()

# EXCLUDE=""
# build_in_sourcedir

B=${S}
# sourcesubdir_append src

###############################################################################
## Change the default (auto-detected) steps to
## extract, patch, configure/setup, build and install the software.
## Make sure the mee_install function does install everything to the
## image directory "${D}"

#mee_extract() {
# bee_extract "${@}"
#}

#mee_patch() {
# bee_patch "${@}"
#}

mee_configure() {
./configure \
--prefix=${PREFIX} \
--enable-shared \
--enable-pthreads \
--enable-gpl \
--enable-swscale \
--enable-postproc \
--enable-libmp3lame \
--enable-libtheora \
--enable-libvorbis \
--enable-libvpx \
--enable-libx264 \
--enable-libxvid \
--enable-swscale
sed -i 's/-lflite"/-lflite -lasound"/' ${S}/configure
start_cmd ${S}/configure \
--prefix=${PREFIX} \
--enable-gpl \
--enable-version3 \
--disable-static \
--enable-shared \
--disable-debug \
--enable-libass \
--enable-libfreetype \
--enable-libmp3lame \
--enable-libopus \
--enable-libtheora \
--enable-libvorbis \
--enable-libvpx \
--enable-libx264 \
--enable-libx265 \
--enable-x11grab
}

mee_build() {
bee_build

cc ${B}/tools/qt-faststart.c -o ${B}/tools/qt-faststart
}

mee_install() {
set -vx
env
#
# bee_install
# mkdir $D/usr/lib/pkgconfig/
# cp $S/lib*/*.pc $D/usr/lib/pkgconfig/

make install DESTDIR=$D
set +vx
start_cmd make install DESTDIR=${D}

install -v -m755 -d ${D}/${BINDIR}
install -v -m755 ${B}/tools/qt-faststart ${D}/${BINDIR}
}
## by default this may be 'make install DESTDIR="${D}"'
12 changes: 3 additions & 9 deletions gegl.be0
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env beesh

# BEE_VERSION gegl-0.2.0-1
# BEE_VERSION gegl-0.2.0-2

## this file was created by bee init and should be executed to build a
## bee-package. (Additional hints are located at the end of this file.)
@@ -15,7 +15,8 @@ SRCURL[0]="http://ftp.gtk.org/pub/gegl/${PKGVERSION[2]}/gegl-${PKGVERSION}.tar.b
## Add URLs/pathes to patch files to the PATCHURL array.
## The sources will be patched in the order of the array.

PATCHURL="http://www.linuxfromscratch.org/patches/blfs/7.9/gegl-0.2.0-ffmpeg2-1.patch"
PATCHURL[0]="http://www.linuxfromscratch.org/patches/blfs/7.9/gegl-0.2.0-ffmpeg2-1.patch"
PATCHURL[1]="/src/mariux/beeroot/downloads/gegl-without-exiv2.patch"

###############################################################################
## Add filename patterns to the EXCLUDE array of files that should not
@@ -51,13 +52,6 @@ mee_configure() {
--without-lua
}

mee_configure_post() {
sed -i -e s/^S["HAVE_EXIV2_FALSE"]=""/S["HAVE_EXIV2_FALSE"]="#"/ \
-i -e s/^S["HAVE_EXIV2_TRUE"]="#"/S["HAVE_EXIV2_TRUE"]=""/ \
-i -e s/^S["EXIV2_LIBS"]="-lexiv2 "/S["EXIV2_LIBS"]=""/ \
config.status
}

#mee_build() {
# bee_build
#}
2 changes: 1 addition & 1 deletion java.be0
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/env beesh

# BEE_VERSION java-1.8.0_102-0
# BEE_VERSION java-1.8.0_102-1

# http://www.oracle.com/technetwork/java/javase/downloads/index.html

37 changes: 0 additions & 37 deletions numactl-2.0.7-0.bee

This file was deleted.

45 changes: 45 additions & 0 deletions numactl.be0
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
#!/usr/bin/env beesh

# BEE_VERSION numactl-2.0.11-0

SRCURL[0]="ftp://oss.sgi.com/www/projects/libnuma/download/numactl-${PKGVERSION}.tar.gz"

PATCHURL[0]=""

# BEE_CONFIGURE=compat

# BEE_BUILDTYPE=

# EXCLUDE=()

# build_in_sourcedir





#mee_extract() {
# bee_extract "${@}"
#}

#mee_patch() {
# bee_patch "${@}"
#}

mee_configure_pre() {
for i in Makefile.am Makefile.in ; do
sed -i 's/move_pages.2//g' ${S}/${i}
done
}

#mee_configure() {
# bee_configure
#}

#mee_build() {
# bee_build prefix=${PREFIX} libdir=${LIBDIR}
#}

#mee_install() {
# bee_install prefix=${D}/${PREFIX} libdir=${D}/${LIBDIR}
#}
52 changes: 2 additions & 50 deletions vlc.be0
Original file line number Diff line number Diff line change
@@ -1,48 +1,18 @@
#!/usr/bin/env beesh

# BEE_VERSION vlc-2.2.4-1

## this file was created by bee init and should be executed to build a
## bee-package. (Additional hints are located at the end of this file.)

###############################################################################
## The source URL(s) define the location of the sources that will be
## downloaded. Version variables may be used to simplify reuse of this bee-file.
# BEE_VERSION vlc-2.2.4-3

SRCURL[0]="http://download.videolan.org/pub/videolan/vlc/${PKGVERSION}/vlc-${PKGVERSION}.tar.xz"

###############################################################################
## Add URLs/pathes to patch files to the PATCHURL array.
## The sources will be patched in the order of the array.

###############################################################################
## Add filename patterns to the EXCLUDE array of files that should not
## be added to you package but may be present in the image directory.
PATCHURL[0]="http://www.linuxfromscratch.org/patches/blfs/svn/vlc-2.2.4-ffmpeg3-1.patch"

# EXCLUDE+=()

###############################################################################
## Uncomment the next statement, if the software may not be able to be build
## outside the source directory and need to be build inside the source
## directory.

# build_in_sourcedir

###############################################################################
## bee cannot detect buildtypes specified in subdirectories.
## Sometimes packages "hide" the real sources in a subdirectory named
## 'src' or 'cmake' or ..
## use 'sourcesubdir_append' to specify this directory if known.

# sourcesubdir_append src


###############################################################################
## Change the default (auto-detected) steps to
## extract, patch, configure/setup, build and install the software.
## Make sure the mee_install function does install everything to the
## image directory "${D}"

#mee_extract() {
# bee_extract "${@}"
#}
@@ -64,21 +34,3 @@ mee_configure() {
# bee_install
#}
## by default this may be 'make install DESTDIR="${D}"'

###############################################################################
##
## Additional hints:
##
## The name of this bee-file should follow the following naming convention:
## pkgname-pkgversion-pkgrevision.bee
##
## You may remove all comments as long as SRCURL[0]="" is set.
##
## Everything in this file will be executed in a bash environment.
##
## Build the package by executing
## './pkg-version-N.bee' or
## 'beesh ./pkg-version-N.bee'
##
## see http://beezinga.org/
##
53 changes: 53 additions & 0 deletions x265.be0
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
#!/usr/bin/env beesh

# BEE_VERSION x265-2.1-0

SRCURL="https://bitbucket.org/multicoreware/x265/downloads/x265_${PKGVERSION}.tar.gz"

PATCHURL="http://www.linuxfromscratch.org/patches/blfs/svn/x265_2.1-enable_static-1.patch"

# EXCLUDE+=()

# build_in_sourcedir

sourcesubdir_append source

#mee_extract() {
# bee_extract "${@}"
#}

#mee_patch() {
# bee_patch "${@}"
#}

mee_configure() {
bee_configure -G "Unix Makefiles" \
-DENABLE_STATIC=OFF
}

#mee_build() {
# bee_build
#}

#mee_install() {
# bee_install
#}
## by default this may be 'make install DESTDIR="${D}"'

###############################################################################
##
## Additional hints:
##
## The name of this bee-file should follow the following naming convention:
## pkgname-pkgversion-pkgrevision.bee
##
## You may remove all comments as long as SRCURL[${PKGVERSION}] is set.
##
## Everything in this file will be executed in a bash environment.
##
## Build the package by executing
## './pkg-version-N.bee' or
## 'beesh ./pkg-version-N.bee'
##
## see http://beezinga.org/
##
17 changes: 16 additions & 1 deletion xine-lib.be0
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env beesh

# BEE_VERSION xine-lib-1.2.5-0
# BEE_VERSION xine-lib-1.2.6-0

SRCURL[0]="http://sourceforge.net/projects/xine/files/xine-lib/${PKGVERSION}/xine-lib-${PKGVERSION}.tar.xz"

@@ -21,6 +21,21 @@ PATCHURL[0]=""
#}

mee_configure() {

sed -e 's/avcodec_alloc_frame/av_frame_alloc/' \
-e 's/avcodec_free_frame/av_frame_free/' \
-i ${S}/src/combined/ffmpeg/ff_{audio,video}_decoder.c \
${S}/src/dxr3/ffmpeg_encoder.c &&

sed -e 's|wand/magick_wand.h|ImageMagick-6/wand/MagickWand.h|' \
-i ${S}/src/video_dec/image.c &&

sed -e '/xineplug_vo_out_xcbxv_la_LIBADD/s/$(XCB_LIBS)/$(XCBSHM_LIBS) $(XCB_LIBS)/' \
-i ${S}/src/video_out/Makefile.in &&

sed -e 's/\(xcb-shape >= 1.0\)/xcb \1/' \
-i ${S}/m4/video_out.m4 &&

bee_configure --disable-vcd \
--with-external-dvdnav
}

0 comments on commit 734126b

Please sign in to comment.