diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-06-08 16:38:05 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-06-08 16:38:05 -0300 |
| commit | c6e5d0d788ee2654a67bac4429d92f1f1df64c69 (patch) | |
| tree | 84d3087e9c9f9aab24d69f83c8e7d1d7bde8dd17 /extra/vlc | |
| parent | 89bffd8b9efae5fd29ca78a4741839ca68eb108f (diff) | |
| parent | bc83221d3c667b70e51dfff6ed212aada3906ee6 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/kid3/kid3.install
community/cherokee/PKGBUILD
community/supercollider/supercollider.install
core/libusb/PKGBUILD
core/systemd/PKGBUILD
core/udev/PKGBUILD
extra/gimp-devel/PKGBUILD
extra/maxima/PKGBUILD
libre/kdenetwork-kopete-libre/PKGBUILD
staging/kdebase-workspace/kdm
staging/kdebindings-perlkde/PKGBUILD
staging/kdebindings-perlqt/PKGBUILD
staging/kdemultimedia/PKGBUILD
staging/kdenetwork/PKGBUILD
staging/kdeplasma-addons/kdeplasma-addons-applets.install
Diffstat (limited to 'extra/vlc')
| -rw-r--r-- | extra/vlc/access_smb_link_to_smbclient.patch | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/extra/vlc/access_smb_link_to_smbclient.patch b/extra/vlc/access_smb_link_to_smbclient.patch deleted file mode 100644 index 3891108d4..000000000 --- a/extra/vlc/access_smb_link_to_smbclient.patch +++ /dev/null @@ -1,15 +0,0 @@ -X-Git-Url: http://git.videolan.org/?p=vlc.git;a=blobdiff_plain;f=modules%2Faccess%2FModules.am;h=be8c47b8fee03e5f4fc42c61b8e13f2d6ad587df;hp=81d8e78edc214026ceff3b17996b7bdbc47b3c26;hb=718b1f9901e5077b50c2189604afba883ca87bf7;hpb=84a1a3461adf901ff134a09eb4341cc301fdc6dd - -diff --git a/modules/access/Modules.am b/modules/access/Modules.am -index 81d8e78..be8c47b 100644 ---- a/modules/access/Modules.am -+++ b/modules/access/Modules.am -@@ -36,7 +36,7 @@ libsdp_plugin_la_DEPENDENCIES = - - libaccess_smb_plugin_la_SOURCES = smb.c - libaccess_smb_plugin_la_CFLAGS = $(AM_CFLAGS) --libaccess_smb_plugin_la_LIBADD = $(AM_LIBADD) -+libaccess_smb_plugin_la_LIBADD = $(AM_LIBADD) $(LIBS_access_smb) - if HAVE_WIN32 - libaccess_smb_plugin_la_LIBADD += -lmpr - endif |